From 033478df29d56dcd0a2b521192f0d53845c6b701 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 15 May 2008 16:05:20 -0400
Subject: [PATCH] Link global config array with class props (to be removed)
---
program/include/rcmail.php | 3 ---
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 ccd46d6..5bde8d4 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -62,14 +62,11 @@
/**
* 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 91e3722..8e956de 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -40,6 +40,8 @@
/**
* Load config from local config file
+ *
+ * @todo Remove global $CONFIG
*/
private function load()
{
@@ -80,6 +82,9 @@
// clear output buffer
ob_end_clean();
+
+ // export config data
+ $GLOBALS['CONFIG'] = &$this->prop;
}
--
Gitblit v1.9.1