More cache factory improvements

horde · Feb 25, 2014 · 2801bd4 · 2801bd4
1 parent ea1c2b4
commit 2801bd4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/framework/Core/lib/Horde/Core/Factory/Cache.php b/framework/Core/lib/Horde/Core/Factory/Cache.php
@@ -55,28 +55,31 @@ public function create(Horde_Injector $injector)
         }
 
         $driver = $this->getDriverName();
-
-        /* Storage driver parameters. */
         $sparams = Horde::getDriverConfig('cache', $driver);
 
         switch ($driver) {
         case 'hashtable':
         // DEPRECATED
         case 'memcache':
             $sparams['hashtable'] = $injector->getInstance('Horde_Core_HashTable_Wrapper');
-            $driver = 'hashtable';
+            $driver = 'Horde_Cache_Storage_Hashtable';
+            unset($sparams['driverconfig'], $sparams['umask']);
             break;
 
         case 'nosql':
             $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'cache');
             if ($nosql instanceof Horde_Mongo_Client) {
                 $sparams['mongo_db'] = $nosql;
                 $driver = 'Horde_Cache_Storage_Mongo';
+            } else {
+                $driver = 'Horde_Cache_Storage_Null';
             }
+            unset($sparams['driverconfig'], $sparams['umask']);
             break;
 
         case 'sql':
             $sparams['db'] = $injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'cache');
+            unset($sparams['driverconfig'], $sparams['umask']);
             break;
         }