don't convert socket -> unix_socket; mysqli uses socket. remove other references...
authorChuck Hagenbuch <chuck@horde.org>
Tue, 26 May 2009 01:49:41 +0000 (21:49 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Tue, 26 May 2009 02:01:32 +0000 (22:01 -0400)
framework/Db/lib/Horde/Db/Adapter/Mysqli.php

index 77cc9d5..9d91e82 100644 (file)
@@ -372,7 +372,7 @@ class Horde_Db_Adapter_Mysqli extends Horde_Db_Adapter_Abstract
     }
 
     /**
-     * Parse configuration array into options for PDO constructor.
+     * Parse configuration array into options for MySQLi constructor.
      *
      * @throws  Horde_Db_Exception
      * @return  array  [host, username, password, dbname, port, socket]
@@ -386,8 +386,8 @@ class Horde_Db_Adapter_Mysqli extends Horde_Db_Adapter_Abstract
             $msg = 'Required config missing: ' . implode(', ', array_keys($diff));
             throw new Horde_Db_Exception($msg);
         }
-        $rails2pdo = array('database' => 'dbname', 'socket' => 'unix_socket');
-        foreach ($rails2pdo as $from => $to) {
+        $rails2mysqli = array('database' => 'dbname');
+        foreach ($rails2mysqli as $from => $to) {
             if (isset($this->_config[$from])) {
                 $this->_config[$to] = $this->_config[$from];
                 unset($this->_config[$from]);