Bug #9331: Only alter setting defaults if entry is in the same scope

diff --git a/framework/Prefs/lib/Horde/Prefs.php b/framework/Prefs/lib/Horde/Prefs.php
index 23da1cc..a9220d5 100644 (file)
--- a/framework/Prefs/lib/Horde/Prefs.php
+++ b/framework/Prefs/lib/Horde/Prefs.php
@@ -561,10 +561,11 @@ class Horde_Prefs implements ArrayAccess
 
         if (($prefs = $this->_storage->get($scope)) !== false) {
             foreach ($prefs as $name => $val) {
-                if ($this->isDefault($name)) {
-                    $this->_scopes[$scope][$name]['d'] = $this->_scopes[$scope][$name]['v'];
-
-                } elseif (!isset($this->_scopes[$scope][$name])) {
+                if (isset($this->_scopes[$scope][$name])) {
+                    if ($this->isDefault($name)) {
+                        $this->_scopes[$scope][$name]['d'] = $this->_scopes[$scope][$name]['v'];
+                    }
+                } else {
                     $this->_scopes[$scope][$name] = array(
                         'm' => 0
                     );