summaryrefslogtreecommitdiffstats
path: root/system/database/DB.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-12 02:29:33 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-12 02:29:33 +0100
commitf94c540435605d7cc6e0d6fbfc68914d29eba6c6 (patch)
tree312b854acca36750a270df8720dd0f6cca0fb3db /system/database/DB.php
parent7e93489fed826286abe2d0b5abd65badc13beab9 (diff)
parent16af6afe991381360439135ddb0735dab1280fed (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-odbc
Diffstat (limited to 'system/database/DB.php')
-rwxr-xr-xsystem/database/DB.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/database/DB.php b/system/database/DB.php
index ed6afd7ed..d06ffb40e 100755
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -82,6 +82,7 @@ function &DB($params = '', $active_record_override = NULL)
$params = array(
'dbdriver' => $dns['scheme'],
'hostname' => (isset($dns['host'])) ? rawurldecode($dns['host']) : '',
+ 'port' => (isset($dns['port'])) ? rawurldecode($dns['port']) : '',
'username' => (isset($dns['user'])) ? rawurldecode($dns['user']) : '',
'password' => (isset($dns['pass'])) ? rawurldecode($dns['pass']) : '',
'database' => (isset($dns['path'])) ? rawurldecode(substr($dns['path'], 1)) : ''