Changeset 3102 in subversion

Timestamp:

Nov 9, 2009 11:18:58 AM (4 years ago)

Author:

thomasb

Message:

Plugins should not overwrite existing config props

Location:

trunk/roundcubemail/program/include

Files:

• rcube_config.php (modified) (1 diff)
• rcube_plugin.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_config.php

@@ -133 +133 @@
    * @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;
       }

trunk/roundcubemail/program/include/rcube_plugin.php

@@ -60 +60 @@
     $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;