summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-05-15 20:05:20 +0000
committerthomascube <thomas@roundcube.net>2008-05-15 20:05:20 +0000
commit033478df29d56dcd0a2b521192f0d53845c6b701 (patch)
tree0d12bd164954a9c5430df2d9658c1c1155a3802d /program/include
parent51cca60914ba708a783d4bb72f1446820e5625c5 (diff)
Link global config array with class props (to be removed)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php3
-rw-r--r--program/include/rcube_config.php5
2 files changed, 5 insertions, 3 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index ccd46d6cb..5bde8d465 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -62,14 +62,11 @@ class rcmail
/**
* Private constructor
- *
- * @todo Remove global $CONFIG
*/
private function __construct()
{
// load configuration
$this->config = new rcube_config();
- $GLOBALS['CONFIG'] = $this->config->all();
register_shutdown_function(array($this, 'shutdown'));
}
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 91e37222c..8e956de1e 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -40,6 +40,8 @@ class rcube_config
/**
* Load config from local config file
+ *
+ * @todo Remove global $CONFIG
*/
private function load()
{
@@ -80,6 +82,9 @@ class rcube_config
// clear output buffer
ob_end_clean();
+
+ // export config data
+ $GLOBALS['CONFIG'] = &$this->prop;
}