From fd71b9b76a25aa7ac15461b4ed422a8645d26c1a Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 21 Dec 2010 10:15:03 -0500 Subject: [PATCH] Fix stacked caching: Remove unnecessary variable assignment using outdated method name Fix assignment of 'stack' parameter in the Stack driver --- framework/Cache/lib/Horde/Cache/Storage/Stack.php | 2 +- framework/Core/lib/Horde/Core/Factory/Cache.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/Cache/lib/Horde/Cache/Storage/Stack.php b/framework/Cache/lib/Horde/Cache/Storage/Stack.php index 09e9e42aa..27bf08ac8 100644 --- 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 eed41f009..c0416aa35 100644 --- 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), -- 2.11.0