From ed273db9d1683777f015a55dd7d51204de7eb528 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Thu, 24 Jul 2014 23:47:02 -0600
Subject: [PATCH] This should be handled internally within the factory rather
 than remotely

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

diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php
index b2143ad41f1..e020c01cf53 100644
--- a/framework/Core/lib/Horde/Core/Factory/Prefs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php
@@ -110,7 +110,7 @@ function_exists($params['user_hook'])) {
         ksort($sig_opts);
         $sig = hash(
             (PHP_MINOR_VERSION >= 4) ? 'fnv132' : 'sha1',
-            serialize($sig_opts)
+            serialize($sig_opts) . '|' . $registry->getAuth()
         );
 
         if (isset($this->_instances[$sig])) {
@@ -207,6 +207,8 @@ protected function _notifyError($e)
 
     /**
      * Clear the instances cache.
+     *
+     * @deprecated
      */
     public function clearCache()
     {
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index a9d6856021a..7e057805632 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -2059,9 +2059,6 @@ public function clearAuth($destroy = true)
         $this->_cache['auth'] = null;
         $this->_cache['existing'] = $this->_cache['isauth'] = array();
 
-        /* Remove the user's cached preferences if they are present. */
-        $GLOBALS['injector']->getInstance('Horde_Core_Factory_Prefs')->clearCache();
-
         if ($destroy) {
             $session->destroy();
         }
@@ -2510,7 +2507,6 @@ public function setAuth($authId, $credentials, array $options = array())
 
         /* Reload preferences for the new user. */
         unset($GLOBALS['prefs']);
-        $injector->getInstance('Horde_Core_Factory_Prefs')->clearCache();
         $this->loadPrefs($this->getApp());
 
         $this->setLanguageEnvironment(isset($options['language']) ? $this->preferredLang($options['language']) : null, $app);