- Fix dont_override setting does not override existing user preferences (#1487664)

1 files changed, 11 insertions, 1 deletions

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 81b664a29..5d176053e 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -188,8 +188,18 @@ class rcube_config
      */
     public function set_user_prefs($prefs)
     {
+        // Honor the dont_override setting for any existing user preferences
+        $dont_override = $this->get('dont_override');
+        if (is_array($dont_override) && !empty($dont_override)) {
+            foreach ($prefs as $key => $pref) {
+                if (in_array($key, $dont_override)) {
+                    unset($prefs[$key]);
+                }
+            }
+        }
+
         $this->userprefs = $prefs;
-        $this->prop = array_merge($this->prop, $prefs);
+        $this->prop      = array_merge($this->prop, $prefs);
     }