summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-02-13 20:07:57 +0100
committerTimothy Warren <tim@timshomepage.net>2012-02-13 20:07:57 +0100
commit928d83ce1590f14aadfa7a1805c00bb84bd9ef1c (patch)
tree4fba071c4eb5262ce5941890e360bbd5d391bc5f
parenta879147d8e117d4a87aeab79eb0347fb7ae13c76 (diff)
Refixed Old-style pdo connection string
-rw-r--r--system/database/drivers/pdo/pdo_driver.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
index 5991586c7..c5940ddc8 100644
--- a/system/database/drivers/pdo/pdo_driver.php
+++ b/system/database/drivers/pdo/pdo_driver.php
@@ -116,15 +116,12 @@ class CI_DB_pdo_driver extends CI_DB {
// hostname generally would have this prototype
// $db['hostname'] = 'pdodriver:host(/Server(/DSN))=hostname(/DSN);';
// We need to get the prefix (pdodriver used by PDO).
- $this->dsn = $this->hostname;
- $this->pdodriver = current(explode(':', $this->hostname));
+ $dsnarray = explode(':', $this->hostname);
+ $this->pdodriver = $dsnarray[0];
// End dsn with a semicolon for extra backward compability
// if database property was not empty.
- if ( ! empty($this->database))
- {
- $this->dsn .= rtrim($this->dsn, ';').';';
- }
+ $this->dsn .= rtrim($this->hostname, ';').';';
}
else
{
@@ -139,7 +136,9 @@ class CI_DB_pdo_driver extends CI_DB {
$this->dsn = $this->pdodriver.':';
// Add hostname to the DSN for databases that need it
- if ( ! empty($this->hostname) && in_array($this->pdodriver, array('informix', 'mysql', 'pgsql', 'sybase', 'mssql', 'dblib', 'cubrid')))
+ if ( ! empty($this->hostname)
+ && strpos($this->hostname, ':') === FALSE
+ && in_array($this->pdodriver, array('informix', 'mysql', 'pgsql', 'sybase', 'mssql', 'dblib', 'cubrid')))
{
$this->dsn .= 'host='.$this->hostname.';';
}