diff options
Diffstat (limited to 'program/lib/Roundcube/rcube_config.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_config.php | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php index 18055f77d..ff398bc00 100644 --- a/program/lib/Roundcube/rcube_config.php +++ b/program/lib/Roundcube/rcube_config.php @@ -69,13 +69,19 @@ class rcube_config */ private function load() { + // Load default settings + if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'defaults.inc.php')) { + $this->errors[] = 'defaults.inc.php was not found.'; + } + // load main config file - if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'main.inc.php')) - $this->errors[] = 'main.inc.php was not found.'; + if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'config.inc.php')) { + $this->errors[] = 'config.inc.php was not found.'; - // load database config - if (!$this->load_from_file(RCUBE_CONFIG_DIR . 'db.inc.php')) - $this->errors[] = 'db.inc.php was not found.'; + // Old configuration files + $this->load_from_file(RCUBE_CONFIG_DIR . 'main.inc.php'); + $this->load_from_file(RCUBE_CONFIG_DIR . 'db.inc.php'); + } // load host-specific configuration $this->load_host_config(); @@ -175,7 +181,12 @@ class rcube_config include($fpath); ob_end_clean(); - if (is_array($rcmail_config)) { + if (is_array($config)) { + $this->merge($config); + return true; + } + // deprecated name of config variable + else if (is_array($rcmail_config)) { $this->merge($rcmail_config); return true; } |