Load prefs on-demand.

horde · Apr 16, 2014 · 59ab64d · 59ab64d
1 parent 5e4fb14
commit 59ab64d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/framework/Core/lib/Horde/Core/Factory/Identity.php b/framework/Core/lib/Horde/Core/Factory/Identity.php
@@ -83,7 +83,6 @@ public function create($user = null, $driver = null)
                     'cache' => false,
                     'user' => $user
                 ));
-                $params['prefs']->retrieve();
             }
 
             $this->_instances[$key] = new $class($params);

diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -114,7 +114,7 @@ function_exists($params['user_hook'])) {
         );
 
         if (isset($this->_instances[$sig])) {
-            $this->_instances[$sig]->retrieve($scope);
+            $this->_instances[$sig]->changeScope($scope);
             return $this->_instances[$sig];
         }
 

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
@@ -1717,7 +1717,7 @@ public function loadPrefs($app = null)
         $user = $this->getAuth();
         if ($user) {
             if (isset($prefs) && ($prefs->getUser() == $user)) {
-                $prefs->retrieve($app);
+                $prefs->changeScope($app);
                 return;
             }
 

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -1195,7 +1195,7 @@
    <package>
     <name>Horde_Prefs</name>
     <channel>pear.horde.org</channel>
-    <min>2.0.0</min>
+    <min>2.6.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>