getOb() -> getDb()

diff --git a/agora/scripts/phorum2agora.php b/agora/scripts/phorum2agora.php
index 18f6322..8f0ae2b 100755 (executable)
--- a/agora/scripts/phorum2agora.php
+++ b/agora/scripts/phorum2agora.php
@@ -19,7 +19,7 @@ require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
 
 /* Open Agora database. */
-$db_agora = $db_phorum = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db_agora = $db_phorum = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 // We accept the user name on the command-line.
 $ret = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), 'h:p:a:t:f:c:',

diff --git a/agora/scripts/upgrades/2006-10-26_forums_table.php b/agora/scripts/upgrades/2006-10-26_forums_table.php
index 20b7f27..05e05cd 100755 (executable)
--- a/agora/scripts/upgrades/2006-10-26_forums_table.php
+++ b/agora/scripts/upgrades/2006-10-26_forums_table.php
@@ -8,7 +8,7 @@ require_once dirname(__FILE__) . '/../../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
 
 /* Open the database. */
-$db = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 /* Copy forums. */
 $max_id = 0;

diff --git a/agora/scripts/upgrades/2006-10-26_messages_table.php b/agora/scripts/upgrades/2006-10-26_messages_table.php
index cad8251..632a49f 100755 (executable)
--- a/agora/scripts/upgrades/2006-10-26_messages_table.php
+++ b/agora/scripts/upgrades/2006-10-26_messages_table.php
@@ -10,7 +10,7 @@ require_once dirname(__FILE__) . '/../../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
 
 /* Open the database. */
-$db = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 /* Get messages. */
 $sql = 'SELECT DISTINCT d.datatree_id, d.datatree_parents FROM horde_datatree d, horde_datatree_attributes a '

diff --git a/agora/scripts/upgrades/2006-10-28_update_counts.php b/agora/scripts/upgrades/2006-10-28_update_counts.php
index 93b72ad..202e5fc 100755 (executable)
--- a/agora/scripts/upgrades/2006-10-28_update_counts.php
+++ b/agora/scripts/upgrades/2006-10-28_update_counts.php
@@ -10,7 +10,7 @@ require_once dirname(__FILE__) . '/../../lib/Application.php';
 Horde_Registry::appInit('agora', array('authentication' => 'none', 'cli' => true));
 
 /* Open the database. */
-$db = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 /* Get threads. */
 $sql = 'SELECT message_id, forum_id FROM agora_messages WHERE message_thread = ?';

diff --git a/folks/config/hooks.php.dist b/folks/config/hooks.php.dist
index 2ea8b5b..f7d03f1 100644 (file)
--- a/folks/config/hooks.php.dist
+++ b/folks/config/hooks.php.dist
@@ -229,7 +229,7 @@ class Folks_Hooks
                 || $group->userIsInGroup($user_uid, 1, false)
                 || $group->userIsInGroup($user_uid, 2, false)) {
 
-                $db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getOb();
+                $db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getDb();
                 $password = $db->getOne('SELECT password FROM mails.accountuser WHERE username = ?', array($user_uid . '@' . $_SERVER['SERVER_NAME']));
 
                 $try = $GLOBALS['registry']->callByPackage('imp', 'authenticate', array($user_uid, array('password' => $password)));
@@ -270,7 +270,7 @@ class Folks_Hooks
             throw new Horde_Exception(_("Username can contain only alphanumeric characters, underscore and minus."));
         }
 
-        $_db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getOb();
+        $_db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getDb();
 
         $query  = 'SELECT user_uid, user_email FROM folks_users WHERE user_uid = ? OR user_email = ?';
         $result = $_db->getRow($query, array($username, $info['extra']['email']), DB_FETCHMODE_ASSOC);
@@ -297,7 +297,7 @@ class Folks_Hooks
      {
         global $conf;
 
-        $_db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getOb();
+        $_db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getDb();
         $fields = array();
         $values = array();
         foreach ($extra as $field => $value) {

diff --git a/folks/scripts/activity.php b/folks/scripts/activity.php
index 24dda77..a712438 100644 (file)
--- a/folks/scripts/activity.php
+++ b/folks/scripts/activity.php
@@ -20,7 +20,7 @@ require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
 
 try {
-    $db = $injector->getInstance('Horde_Db_Pear')->getOb();
+    $db = $injector->getInstance('Horde_Db_Pear')->getDb();
 } catch (Horde_Exception $e) {
     $cli->fatal($e);
 }

diff --git a/folks/scripts/import_letter.php b/folks/scripts/import_letter.php
index 057bf7a..d9592a1 100644 (file)
--- a/folks/scripts/import_letter.php
+++ b/folks/scripts/import_letter.php
@@ -20,7 +20,7 @@ require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
 
 try {
-    $db = $injector->getInstance('Horde_Db_Pear')->getOb();
+    $db = $injector->getInstance('Horde_Db_Pear')->getDb();
 } catch (Horde_Exception $e) {
     $cli->fatal($e);
 }

diff --git a/folks/scripts/mail-filter.php b/folks/scripts/mail-filter.php
index 9c83e9a..fc556f1 100644 (file)
--- a/folks/scripts/mail-filter.php
+++ b/folks/scripts/mail-filter.php
@@ -108,7 +108,7 @@ $from_str = array('Undelivered Mail', 'MAILER-DAEMON', 'root@' . $conf['server']
 
 // Connect to db
 try {
-    $db = $injector->getInstance('Horde_Db_Pear')->getOb();
+    $db = $injector->getInstance('Horde_Db_Pear')->getDb();
 } catch (Horde_Exception $e) {
     $cli->fatal($e);
 }

diff --git a/folks/scripts/mail.php b/folks/scripts/mail.php
index 11c3db5..6a0ad86 100644 (file)
--- a/folks/scripts/mail.php
+++ b/folks/scripts/mail.php
@@ -81,7 +81,7 @@ if (!$registry->isAdmin(array('permission' => 'folks:admin'))) {
 
 // Connect to db
 try {
-    $db = $injector->getInstance('Horde_Db_Pear')->getOb();
+    $db = $injector->getInstance('Horde_Db_Pear')->getDb();
 } catch (Horde_Exception $e) {
     $cli->fatal($e);
 }

diff --git a/folks/scripts/popularity.php b/folks/scripts/popularity.php
index ad326c3..90ec7d1 100644 (file)
--- a/folks/scripts/popularity.php
+++ b/folks/scripts/popularity.php
@@ -20,7 +20,7 @@ require_once dirname(__FILE__) . '/../lib/Application.php';
 Horde_Registry::appInit('folks', array('authentication' => 'none', 'cli' => true));
 
 try {
-    $db = $injector->getInstance('Horde_Db_Pear')->getOb();
+    $db = $injector->getInstance('Horde_Db_Pear')->getDb();
 } catch (Horde_Exception $e) {
     $cli->fatal($e);
 }

diff --git a/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php b/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php
index 1339149..c0071fe 100644 (file)
--- a/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php
+++ b/framework/Core/lib/Horde/Core/Auth/Signup/Sql.php
@@ -49,7 +49,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
             serialize($signup->getData())
         );
 
-        $GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'signup')->insert($query, $values);
+        $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->insert($query, $values);
     }
 
     /**
@@ -70,7 +70,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
                  ' WHERE user_name = ?';
         $values = array($user);
 
-        return (bool)$GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'signup')->selectValue($query, $values);
+        return (bool)$GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->selectValue($query, $values);
     }
 
     /**
@@ -89,7 +89,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
                  ' WHERE user_name = ?';
         $values = array($username);
 
-        $result = $GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'signup')->selectOne($query, $values);
+        $result = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->selectOne($query, $values);
         if (empty($result)) {
             throw new Horde_Exception(sprintf(_("User \"%s\" does not exist."), $username));
         }
@@ -111,7 +111,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
         $query = 'SELECT * FROM ' . $this->_params['table'] .
                  ' ORDER BY signup_date';
 
-        $result = $GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'signup')->selectAll($query);
+        $result = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->selectAll($query);
         if (empty($result)) {
             return array();
         }
@@ -139,7 +139,7 @@ class Horde_Core_Auth_Signup_Sql extends Horde_Core_Auth_Signup_Base
                  ' WHERE user_name = ?';
         $values = array($username);
 
-        $GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'signup')->delete($query, $values);
+        $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'signup')->delete($query, $values);
     }
 
     /**

diff --git a/framework/Core/lib/Horde/Core/Binder/Alarm.php b/framework/Core/lib/Horde/Core/Binder/Alarm.php
index 49f204e..27fa7ee 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Alarm.php
+++ b/framework/Core/lib/Horde/Core/Binder/Alarm.php
@@ -13,7 +13,7 @@ class Horde_Core_Binder_Alarm implements Horde_Injector_Binder
         $params = Horde::getDriverConfig('alarms', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'alarm');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'alarm');
             $config = $injector->getInstance('Horde_Db')->getConfig('alarm');
             $params['charset'] = $config['charset'];
         }

diff --git a/framework/Core/lib/Horde/Core/Binder/Cache.php b/framework/Core/lib/Horde/Core/Binder/Cache.php
index 17a1589..19c02d9 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Cache.php
+++ b/framework/Core/lib/Horde/Core/Binder/Cache.php
@@ -27,7 +27,7 @@ class Horde_Core_Binder_Cache implements Horde_Injector_Binder
         if (strcasecmp($driver, 'Memcache') === 0) {
             $params['memcache'] = $injector->getInstance('Horde_Memcache');
         } elseif (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'cache');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'cache');
         }
 
         if (!empty($GLOBALS['conf']['cache']['use_memorycache']) &&

diff --git a/framework/Core/lib/Horde/Core/Binder/Lock.php b/framework/Core/lib/Horde/Core/Binder/Lock.php
index ed82f00..3fad1b2 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Lock.php
+++ b/framework/Core/lib/Horde/Core/Binder/Lock.php
@@ -19,7 +19,7 @@ class Horde_Core_Binder_Lock implements Horde_Injector_Binder
         $params['logger'] = $injector->getInstance('Horde_Log_Logger');
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'lock');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'lock');
         }
 
         return Horde_Lock::factory($driver, $params);

diff --git a/framework/Core/lib/Horde/Core/Binder/Perms.php b/framework/Core/lib/Horde/Core/Binder/Perms.php
index 20ae3dc..ab208c9 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Perms.php
+++ b/framework/Core/lib/Horde/Core/Binder/Perms.php
@@ -21,7 +21,7 @@ class Horde_Core_Binder_Perms implements Horde_Injector_Binder
                 array_merge(Horde::getDriverConfig('datatree', $dt_driver), array('group' => 'horde.perms'))
             );
         } elseif (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'perms');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'perms');
         }
 
         $params['cache'] = $injector->getInstance('Horde_Cache');

diff --git a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
index 0e017f0..d384aac 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
+++ b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
@@ -20,7 +20,7 @@ class Horde_Core_Binder_SessionHandler implements Horde_Injector_Binder
         $params = Horde::getDriverConfig('sessionhandler', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'sessionhandler');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'sessionhandler');
         } elseif (strcasecmp($driver, 'Memcache') === 0) {
             $params['memcache'] = $injector->getInstance('Horde_Memcache');
         } elseif (strcasecmp($driver, 'Ldap') === 0) {

diff --git a/framework/Core/lib/Horde/Core/Binder/Token.php b/framework/Core/lib/Horde/Core/Binder/Token.php
index 7b8e5b5..75ab882 100644 (file)
--- a/framework/Core/lib/Horde/Core/Binder/Token.php
+++ b/framework/Core/lib/Horde/Core/Binder/Token.php
@@ -15,7 +15,7 @@ class Horde_Core_Binder_Token implements Horde_Injector_Binder
             : array();
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('horde', 'token');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('horde', 'token');
         } elseif (strcasecmp($driver, 'None') === 0) {
             $driver = 'Null';
         }

diff --git a/framework/Core/lib/Horde/Core/Factory/Auth.php b/framework/Core/lib/Horde/Core/Factory/Auth.php
index cf23ce7..26d89b6 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Auth.php
+++ b/framework/Core/lib/Horde/Core/Factory/Auth.php
@@ -131,7 +131,7 @@ class Horde_Core_Factory_Auth
                 break;
 
             case 'sql':
-                $params['db'] = $this->_injector->getInstance('Horde_Db')->getOb('auth');
+                $params['db'] = $this->_injector->getInstance('Horde_Db')->getDb('auth');
                 break;
             }
 

diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
index bedd704..f51bd42 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Db.php
+++ b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -63,7 +63,7 @@ class Horde_Core_Factory_Db
      * @throws Horde_Exception
      * @throws Horde_Db_Exception
      */
-    public function getOb($app = 'horde', $type = null)
+    public function getDb($app = 'horde', $type = null)
     {
         $sig = $app . '|' . $type;
 

diff --git a/framework/Core/lib/Horde/Core/Factory/DbPear.php b/framework/Core/lib/Horde/Core/Factory/DbPear.php
index 7c2474d..7a72fbb 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/DbPear.php
+++ b/framework/Core/lib/Horde/Core/Factory/DbPear.php
@@ -59,7 +59,7 @@ class Horde_Core_Factory_DbPear
      * @return DB  The singleton DB instance.
      * @throws Horde_Exception
      */
-    public function getOb($type = 'rw')
+    public function getDb($type = 'rw')
     {
         if (isset($this->_instances[$type])) {
             return $this->_instances[$type];

diff --git a/framework/Group/lib/Horde/Group/Sql.php b/framework/Group/lib/Horde/Group/Sql.php
index 31ee5ab..50e8a60 100644 (file)
--- a/framework/Group/lib/Horde/Group/Sql.php
+++ b/framework/Group/lib/Horde/Group/Sql.php
@@ -25,7 +25,7 @@ class Horde_Group_Sql extends Horde_Group
     public function __construct($params)
     {
         $this->_params = $params;
-        $this->db = $GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'group');
+        $this->db = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'group');
     }
 
     /**

diff --git a/framework/Prefs/lib/Horde/Prefs/Sql.php b/framework/Prefs/lib/Horde/Prefs/Sql.php
index e863227..059db23 100644 (file)
--- a/framework/Prefs/lib/Horde/Prefs/Sql.php
+++ b/framework/Prefs/lib/Horde/Prefs/Sql.php
@@ -268,7 +268,7 @@ class Horde_Prefs_Sql extends Horde_Prefs
             return;
         }
 
-        $this->_db = $GLOBALS['injector']->getInstance('Horde_Db')->getOb('horde', 'prefs');
+        $this->_db = $GLOBALS['injector']->getInstance('Horde_Db')->getDb('horde', 'prefs');
         $this->_params = array_merge(array(
             'table' => 'horde_prefs'
         ), Horde::getDriverConfig('prefs'));

diff --git a/framework/SyncML/SyncML/Backend/Horde.php b/framework/SyncML/SyncML/Backend/Horde.php
index 963079d..ac973a0 100644 (file)
--- a/framework/SyncML/SyncML/Backend/Horde.php
+++ b/framework/SyncML/SyncML/Backend/Horde.php
@@ -30,7 +30,7 @@ class SyncML_Backend_Horde extends SyncML_Backend {
     {
         parent::__construct($params);
 
-        $this->_db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getOb();
+        $this->_db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getDb();
     }
 
     /**

diff --git a/framework/admintools/horde-create-sequence.php b/framework/admintools/horde-create-sequence.php
index 247e0f0..ec2fd09 100755 (executable)
--- a/framework/admintools/horde-create-sequence.php
+++ b/framework/admintools/horde-create-sequence.php
@@ -32,7 +32,7 @@ if (is_null($sequence)) {
 
 switch ($db_lib) {
 case 'DB':
-    $dbh = $injector->getInstance('Horde_Db_Pear')->getOb();
+    $dbh = $injector->getInstance('Horde_Db_Pear')->getDb();
     break;
 
 case 'MDB2':

diff --git a/horde/admin/sqlshell.php b/horde/admin/sqlshell.php
index 9ab8cfc..f43f0d9 100644 (file)
--- a/horde/admin/sqlshell.php
+++ b/horde/admin/sqlshell.php
@@ -24,7 +24,7 @@ require HORDE_TEMPLATES . '/admin/menu.inc';
 
 <?php
 
-$dbh = $injector->getInstance('Horde_Db_Pear')->getOb();
+$dbh = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 if (Horde_Util::getFormData('list-tables')) {
     $description = 'LIST TABLES';

diff --git a/horde/config/hooks.php.dist b/horde/config/hooks.php.dist
index 7fdbd42..6c48ecd 100644 (file)
--- a/horde/config/hooks.php.dist
+++ b/horde/config/hooks.php.dist
@@ -577,7 +577,7 @@ class Horde_Hooks
 //        store this in whichever backend you require.
 //        // NOTE: You NEED Turba to be correctly installed before you can use
 //        // this example. It also assumes you are using an SQL backend.
-//        $db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getOb();
+//        $db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getDb();
 //
 //        $fields = $values = array();
 //        foreach ($extra as $field => $value) {
@@ -655,7 +655,7 @@ class Horde_Hooks
 //        switch ($groupName) {
 //        case 'IT_department':
 //            $dept = 'IT';
-//            $db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getOb();
+//            $db = $GLOBALS['injector']->getInstance('Horde_Db_Pear')->getDb();
 //            $query = 'SELECT COUNT(*) FROM departments WHERE user_name = ? AND department = ?';
 //            $values = array($userName, $dept);
 //            $result = $db->getOne($query, $values);

diff --git a/horde/lib/Block/metar.php b/horde/lib/Block/metar.php
index 298e535..40cab0a 100644 (file)
--- a/horde/lib/Block/metar.php
+++ b/horde/lib/Block/metar.php
@@ -46,7 +46,7 @@ class Horde_Block_Horde_metar extends Horde_Block {
             global $conf;
 
             // Get locations from the database.
-            $db = $injector->getInstance('Horde_Db_Pear')->getOb();
+            $db = $injector->getInstance('Horde_Db_Pear')->getDb();
 
             $result = $db->query('SELECT icao, name, country FROM metarAirports ORDER BY country');
             if (is_a($result, 'PEAR_Error')) {

diff --git a/horde/scripts/upgrades/convert_datatree_groups_to_sql.php b/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
index 409fe1b..4c507f6 100755 (executable)
--- a/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
+++ b/horde/scripts/upgrades/convert_datatree_groups_to_sql.php
@@ -24,7 +24,7 @@ VALUES
     (?, ?)
 ';
 
-$db = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 foreach ($g->listGroups(true) as $id => $name) {
     if ($id == -1) {

diff --git a/horde/scripts/upgrades/convert_datatree_perms_to_sql.php b/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
index 2b6fd39..29da5d4 100755 (executable)
--- a/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
+++ b/horde/scripts/upgrades/convert_datatree_perms_to_sql.php
@@ -17,7 +17,7 @@ VALUES
     (?, ?, ?, ?)
 ';
 
-$db = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db = $injector->getInstance('Horde_Db_Pear')->getDb();
 
 foreach ($p->getTree() as $id => $row) {
     if ($id == -1) {

diff --git a/imp/lib/Injector/Binder/Sentmail.php b/imp/lib/Injector/Binder/Sentmail.php
index 460119b..16b9f66 100644 (file)
--- a/imp/lib/Injector/Binder/Sentmail.php
+++ b/imp/lib/Injector/Binder/Sentmail.php
@@ -24,7 +24,7 @@ class IMP_Injector_Binder_Sentmail implements Horde_Injector_Binder
         $params = Horde::getDriverConfig('sentmail', $driver);
 
         if (strcasecmp($driver, 'Sql') === 0) {
-            $params['db'] = $injector->getInstance('Horde_Db')->getOb('imp', 'sentmail');
+            $params['db'] = $injector->getInstance('Horde_Db')->getDb('imp', 'sentmail');
         } elseif (strcasecmp($driver, 'None') === 0) {
             $driver = 'Null';
         }

diff --git a/kronolith/scripts/upgrades/convert_to_utc.php b/kronolith/scripts/upgrades/convert_to_utc.php
index ce3a737..6438106 100755 (executable)
--- a/kronolith/scripts/upgrades/convert_to_utc.php
+++ b/kronolith/scripts/upgrades/convert_to_utc.php
@@ -10,7 +10,7 @@ Horde_Registry::appInit('kronolith', array('authentication' => 'none', 'cli' =>
 
 /* Prepare DB stuff. */
 PEAR::pushErrorHandling(PEAR_ERROR_CALLBACK, create_function('$e', 'echo $e->toString()."\n";exit;'));
-$db = $injector->getInstance('Horde_Db_Pear')->getOb();
+$db = $injector->getInstance('Horde_Db_Pear')->getDb();
 $result = $db->query('SELECT event_title, event_id, event_creator_id, event_start, event_end, event_allday, event_recurenddate FROM ' . $conf['calendar']['params']['table'] . ' ORDER BY event_creator_id');
 $stmt = $db->prepare('UPDATE kronolith_events SET event_start = ?, event_end = ?, event_recurenddate = ? WHERE event_id = ?');