From 1fcf616d1910b242bf0fa46ed363f6f6396bb9d7 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 7 Oct 2010 11:04:58 -0600 Subject: [PATCH] Fixes for recent factory changes. --- framework/Core/lib/Horde/Core/Factory/History.php | 2 +- framework/Core/lib/Horde/Core/Factory/Vfs.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/Core/lib/Horde/Core/Factory/History.php b/framework/Core/lib/Horde/Core/Factory/History.php index 4f456dc73..d8ea5036f 100644 --- 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 f0829b2ef..6ddb73bd5 100644 --- 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; } -- 2.11.0