Index: catalog/adodb/adodb.inc.php
===================================================================
--- catalog/adodb/adodb.inc.php	(revision 73560)
+++ catalog/adodb/adodb.inc.php	(working copy)
@@ -202,35 +202,30 @@
     }


-    if (!defined('ADODB_ERROR_HANDLER')) {
+    function imvu_adodb_error_handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
+    {
+        if(mocks::is_mocked()) return mocks::get();
+        switch($fn) {
+            case 'EXECUTE':
+                $sql = $p1;
+                $inputparams = $p2;

-        define('ADODB_ERROR_HANDLER','imvu_adodb_error_handler');
+                $s = "adodb $dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
+                break;

-        function imvu_adodb_error_handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-        {
-            if(mocks::is_mocked()) return mocks::get();
-            switch($fn) {
-                case 'EXECUTE':
-                    $sql = $p1;
-                    $inputparams = $p2;
+            case 'PCONNECT':
+            case 'CONNECT':
+                $host = $p1;
+                $database = $p2;

-                    $s = "adodb $dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
-                    break;
-
-                case 'PCONNECT':
-                case 'CONNECT':
-                    $host = $p1;
-                    $database = $p2;
-
-                    $s = "adodb $dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
-                    break;
-                default:
-                    $s = "adodb $dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
-                    break;
-            }
-
-            tep_error_log($s);
+                $s = "adodb $dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
+                break;
+            default:
+                $s = "adodb $dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
+                break;
         }
+
+        tep_error_log($s);
     }


@@ -467,7 +462,6 @@
     var $_errorCode = false;    /// Last error code, not guaranteed to be used - only by oci8
     var $_queryID = false;      /// This variable keeps the last created result link identifier

-    var $_isPersistentConnection = false;   /// A boolean variable to state whether its a persistent connection or normal connection.   */
     var $_bindInputArray = false; /// set to true if ADOConnection.Execute() permits binding of array parameters.
     var $_evalAll = false;
     var $_affected = false;
@@ -527,17 +521,6 @@

     }

-    /**
-     * Connect to database
-     *
-     * @param [argHostname]     Host to connect to
-     * @param [argUsername]     Userid to login
-     * @param [argPassword]     Associated password
-     * @param [argDatabaseName] database
-     * @param [forceNew]        force new connection
-     *
-     * @return true or false
-     */
     function Connect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "", $forceNew = false)
     {
         if ($argHostname != "") $this->host = $argHostname;
@@ -545,8 +528,6 @@
         if ($argPassword != "") $this->password = $argPassword; // not stored for security reasons
         if ($argDatabaseName != "") $this->database = $argDatabaseName;

-        $this->_isPersistentConnection = false;
-
         if ($forceNew) {
             if ($this->_nconnect($this->host, $this->user, $this->password, $this->database)) {
                 return true;
@@ -570,49 +551,18 @@
         return false;
     }

-     function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
-     {
-        return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
-     }
-
-
-    /**
-     * Always force a new connection to database - currently only works with oracle
-     *
-     * @param [argHostname]     Host to connect to
-     * @param [argUsername]     Userid to login
-     * @param [argPassword]     Associated password
-     * @param [argDatabaseName] database
-     *
-     * @return true or false
-     */
-    function NConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
+    function _nconnect($argHostname, $argUsername, $argPassword, $argDatabaseName)
     {
-        return $this->Connect($argHostname, $argUsername, $argPassword, $argDatabaseName, true);
+        return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabaseName);
     }

-    /**
-     * Establish persistent connect to database
-     *
-     * @param [argHostname]     Host to connect to
-     * @param [argUsername]     Userid to login
-     * @param [argPassword]     Associated password
-     * @param [argDatabaseName] database
-     *
-     * @return return true or false
-     */
     function PConnect($argHostname = "", $argUsername = "", $argPassword = "", $argDatabaseName = "")
     {
-        if (defined('ADODB_NEVER_PERSIST'))
-            return $this->Connect($argHostname,$argUsername,$argPassword,$argDatabaseName);
-
         if ($argHostname != "") $this->host = $argHostname;
         if ($argUsername != "") $this->user = $argUsername;
         if ($argPassword != "") $this->password = $argPassword;
         if ($argDatabaseName != "") $this->database = $argDatabaseName;

-        $this->_isPersistentConnection = true;
-
         if ($fn = $this->raiseErrorFn) {
             if ($this->_pconnect($this->host, $this->user, $this->password, $this->database)) return true;
             $err = $this->ErrorMsg();
@@ -2417,13 +2367,6 @@
             if ($this->_fetch()) return true;
         }
         $this->EOF = true;
-        /* -- tested error handling when scrolling cursor -- seems useless.
-        $conn = $this->connection;
-        if ($conn && $conn->raiseErrorFn && ($errno = $conn->ErrorNo())) {
-            $fn = $conn->raiseErrorFn;
-            $fn($conn->databaseType,'MOVENEXT',$errno,$conn->ErrorMsg().' ('.$this->sql.')',$conn->host,$conn->database);
-        }
-        */
         return false;
     }

@@ -3073,8 +3016,7 @@
             }

             $obj =& new $cls();
-            $errorfn = (defined('ADODB_ERROR_HANDLER')) ? ADODB_ERROR_HANDLER : false;
-            if ($errorfn) $obj->raiseErrorFn = $errorfn;
+            $obj->raiseErrorFn = 'imvu_adodb_error_handler';

             return $obj;
         }
Index: catalog/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- catalog/adodb/drivers/adodb-mysql.inc.php	(revision 73524)
+++ catalog/adodb/drivers/adodb-mysql.inc.php	(working copy)
@@ -436,16 +436,12 @@
     }

     function _connect($argHostname, $argUsername, $argPassword, $argDatabasename) {
-        //tep_error_log("chondl - adodb-mysql _connect called $argHostname $argDatabasename");
-        $args = array("connect", $argHostname, $argUsername, $argPassword, $argDatabasename);
-        $this->_connectArgs = $args;
+        $this->_connectArgs = array("connect", $argHostname, $argUsername, $argPassword, $argDatabasename);
         return true;
     }

     function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename) {
-        //tep_error_log("chondl - adodb-mysql _pconnect called $argHostname $argDatabasename");
-        $args = array("pconnect", $argHostname, $argUsername, $argPassword, $argDatabasename);
-        $this->_connectArgs = $args;
+        $this->_connectArgs = array("pconnect", $argHostname, $argUsername, $argPassword, $argDatabasename);
         return true;
     }