Removed global $CONFIG variable

7 years ago · bb67757b5c
parent 872e6e647b
commit bb67757b5c
2 changed files with 1 additions and 5 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================

+- Removed global $CONFIG variable
 - Password: Automatic virtualmin domain setting, removed password_virtualmin_format option (#5759)
 - Support AUTHENTICATE LOGIN for IMAP connections (#5563)
 - Support LDAP GSSAPI authentication (#5703)
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@ -191,8 +191,6 @@ class rcube_config

    /**
     * Load config from local config file
-     *
-     * @todo Remove global $CONFIG
     */
    private function load()
    {
@ -262,9 +260,6 @@ class rcube_config

        // remove deprecated properties
        unset($this->prop['dst_active']);
-
-        // export config data
-        $GLOBALS['CONFIG'] = &$this->prop;
    }

    /**