Fixes for recent factory changes.

diff --git a/framework/Core/lib/Horde/Core/Factory/History.php b/framework/Core/lib/Horde/Core/Factory/History.php
index 4f456dc..d8ea503 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/History.php
+++ b/framework/Core/lib/Horde/Core/Factory/History.php
@@ -3,7 +3,7 @@
  * @category Horde
  * @package  Core
  */
-class Horde_Core_Factory
+class Horde_Core_Factory_History
 {
     public function create(Horde_Injector $injector)
     {

diff --git a/framework/Core/lib/Horde/Core/Factory/Vfs.php b/framework/Core/lib/Horde/Core/Factory/Vfs.php
index f0829b2..6ddb73b 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Vfs.php
+++ b/framework/Core/lib/Horde/Core/Factory/Vfs.php
@@ -87,16 +87,16 @@ class Horde_Core_Factory_Vfs
 
         switch ($vfs['type']) {
         case 'sql':
-            $db_pear = $this->_injector->getInstance('Horde_Db_Pear');
+            $db_pear = $this->_injector->getInstance('Horde_Core_Factory_DbPear');
             $vfs['params'] = $db_pear->getConfig('vfs');
-            $vfs['params']['db'] = $db_pear->getDb('read', 'horde', 'vfs');
-            $vfs['params']['writedb'] = $db_pear->getDb('rw', 'horde', 'vfs');
+            $vfs['params']['db'] = $db_pear->create('read', 'horde', 'vfs');
+            $vfs['params']['writedb'] = $db_pear->create('rw', 'horde', 'vfs');
             break;
 
         case 'sql_file':
-            $db_pear = $this->_injector->getInstance('Horde_Db_Pear');
+            $db_pear = $this->_injector->getInstance('Horde_Core_Factory_DbPear');
             $vfs['params'] = $db_pear->getConfig('vfs');
-            $vfs['params']['db'] = $db_pear->getDb('rw', 'horde', 'vfs');
+            $vfs['params']['db'] = $db_pear->create('rw', 'horde', 'vfs');
             break;
         }