From cf315723c4831cf4b7f94714596fe550f56ecab0 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Thu, 3 Jun 2010 10:11:45 -0400 Subject: [PATCH] More Horde_Db_Base -> Horde_Db_Adapter_Base fixes --- horde/lib/Prefs/Ui.php | 4 ++-- horde/rpc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/horde/lib/Prefs/Ui.php b/horde/lib/Prefs/Ui.php index 8c5af8963..32c8537ee 100644 --- a/horde/lib/Prefs/Ui.php +++ b/horde/lib/Prefs/Ui.php @@ -406,7 +406,7 @@ class Horde_Prefs_Ui { if (!empty($GLOBALS['conf']['activesync']['enabled'])) { $state_params = $GLOBALS['conf']['activesync']['state']['params']; - $state_params['db'] = $GLOBALS['injector']->getInstance('Horde_Db_Base'); + $state_params['db'] = $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base'); $stateMachine = new Horde_ActiveSync_State_History($state_params); } else { return _("ActiveSync not activated."); @@ -691,7 +691,7 @@ class Horde_Prefs_Ui protected function _updateActiveSyncManagement($ui) { $state_params = $GLOBALS['conf']['activesync']['state']['params']; - $state_params['db'] = $GLOBALS['injector']->getInstance('Horde_Db_Base'); + $state_params['db'] = $GLOBALS['injector']->getInstance('Horde_Db_Adapter_Base'); $stateMachine = new Horde_ActiveSync_State_History($state_params); $stateMachine->setLogger($GLOBALS['injector']->getInstance('Horde_Log_Logger')); if ($ui->vars->wipeid) { diff --git a/horde/rpc.php b/horde/rpc.php index 7d8e75f9e..9ae35428a 100644 --- a/horde/rpc.php +++ b/horde/rpc.php @@ -60,7 +60,7 @@ if ((!empty($_SERVER['CONTENT_TYPE']) && break; case 'history': $state_params = $conf['activesync']['state']['params']; - $state_params['db'] = $injector->getInstance('Horde_Db_Base'); + $state_params['db'] = $injector->getInstance('Horde_Db_Adapter_Base'); $stateMachine = new Horde_ActiveSync_State_History($state_params); } -- 2.11.0