More Horde_Db_Base -> Horde_Db_Adapter_Base fixes

diff --git a/horde/lib/Prefs/Ui.php b/horde/lib/Prefs/Ui.php
index 8c5af89..32c8537 100644 (file)
--- 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 7d8e75f..9ae3542 100644 (file)
--- 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);
         }