diff options
| -rw-r--r-- | program/include/rcmail.php | 3 | ||||
| -rw-r--r-- | program/include/rcube_config.php | 5 |
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; } |