From 341be5fd5e3fd9bc0ba15ba9bf667c5551d8bc75 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Mon, 25 May 2009 21:49:41 -0400 Subject: [PATCH] don't convert socket -> unix_socket; mysqli uses socket. remove other references to pdo --- framework/Db/lib/Horde/Db/Adapter/Mysqli.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysqli.php b/framework/Db/lib/Horde/Db/Adapter/Mysqli.php index 77cc9d5a1..9d91e8236 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Mysqli.php +++ b/framework/Db/lib/Horde/Db/Adapter/Mysqli.php @@ -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]); -- 2.11.0