Fix stacked caching:

Remove unnecessary variable assignment using outdated method name
Fix assignment of 'stack' parameter in the Stack driver

diff --git a/framework/Cache/lib/Horde/Cache/Storage/Stack.php b/framework/Cache/lib/Horde/Cache/Storage/Stack.php
index 09e9e42..27bf08a 100644 (file)
--- a/framework/Cache/lib/Horde/Cache/Storage/Stack.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Stack.php
@@ -40,7 +40,7 @@ class Horde_Cache_Storage_Stack extends Horde_Cache_Storage_Base
         if (!isset($params['stack'])) {
             throw new InvalidArgumentException('Missing stack parameter.');
         }
-        $this->_stack[] = $params['stack'];
+        $this->_stack = $params['stack'];
         unset($params['stack']);
 
         parent::__construct($params);

diff --git a/framework/Core/lib/Horde/Core/Factory/Cache.php b/framework/Core/lib/Horde/Core/Factory/Cache.php
index eed41f0..c0416aa 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Cache.php
+++ b/framework/Core/lib/Horde/Core/Factory/Cache.php
@@ -68,7 +68,6 @@ class Horde_Core_Factory_Cache
                 $params['memcache'] = $injector->getInstance('Horde_Memcache');
             }
 
-            $cname = $this->_driverToClassname($GLOBALS['conf']['cache']['use_memorycache']);
             $storage = new Horde_Cache_Storage_Stack(array(
                 'stack' => array(
                     $this->_getStorage($GLOBALS['conf']['cache']['use_memorycache'], $params),