From 59ab64d1f1008e9b8d41da7db2a3c56caf0c941d Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Tue, 15 Apr 2014 22:28:14 -0600
Subject: [PATCH] Load prefs on-demand.

---
 framework/Core/lib/Horde/Core/Factory/Identity.php | 1 -
 framework/Core/lib/Horde/Core/Factory/Prefs.php    | 2 +-
 framework/Core/lib/Horde/Registry.php              | 2 +-
 framework/Core/package.xml                         | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/Factory/Identity.php b/framework/Core/lib/Horde/Core/Factory/Identity.php
index ddcd3e97ae3..ad325364105 100644
--- 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
index 517ed79ddbe..684778b11aa 100644
--- 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
index aecf345d544..461501542c6 100644
--- 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
index a050fc090cb..7c1299413de 100644
--- 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>