Bug #9282: When creating Horde_Db objects, register them with a child injector before...

diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
index 251c7d4..72ab8fd 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Db.php
+++ b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -165,7 +165,11 @@ class Horde_Core_Factory_Db
             $ob = new $class($config);
 
             if (!isset($config['cache'])) {
-                $ob->setCache($this->_injector->getInstance('Horde_Cache'));
+                $injector = $this->_injector->createChildInjector();
+                $injector->setInstance('Horde_Db_Adapter', $ob);
+                $cacheFactory = $this->_injector->getInstance('Horde_Core_Factory_Cache');
+                $cache = $cacheFactory->create($injector);
+                $ob->setCache($cache);
             }
 
             if (!isset($config['logger'])) {

diff --git a/framework/Core/lib/Horde/Core/Factory/DbBase.php b/framework/Core/lib/Horde/Core/Factory/DbBase.php
index 4b74a67..281c6c0 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/DbBase.php
+++ b/framework/Core/lib/Horde/Core/Factory/DbBase.php
@@ -16,5 +16,4 @@ class Horde_Core_Factory_DbBase
     {
         return $injector->getInstance('Horde_Core_Factory_Db')->create('horde');
     }
-
 }