diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_config.php | 4 | ||||
| -rw-r--r-- | program/include/rcube_plugin.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index b30cf2d38..0aa6f8c58 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -132,12 +132,12 @@ class rcube_config * @param string Full path to the config file to be loaded * @return booelan True on success, false on failure */ - public function load_from_file($fpath) + public function load_from_file($fpath, $merge = true) { if (is_file($fpath) && is_readable($fpath)) { include($fpath); if (is_array($rcmail_config)) { - $this->prop = array_merge($this->prop, $rcmail_config); + $this->prop = $merge ? array_merge($this->prop, $rcmail_config) : $this->prop + $rcmail_config; return true; } } diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php index ed30e8f17..cb5f8e256 100644 --- a/program/include/rcube_plugin.php +++ b/program/include/rcube_plugin.php @@ -59,7 +59,7 @@ abstract class rcube_plugin { $fpath = $this->home.'/'.$fname; $rcmail = rcmail::get_instance(); - if (!$rcmail->config->load_from_file($fpath)) { + if (!$rcmail->config->load_from_file($fpath, false)) { raise_error(array('code' => 527, 'type' => 'php', 'message' => "Failed to load config from $fpath"), true, false); return false; } |