summaryrefslogtreecommitdiffstats
path: root/system/database/DB.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-12 22:38:46 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-12 22:38:46 +0100
commit432b13f8e168006eac9d551c0ac463dadd3ef803 (patch)
tree6635eda43e986e11bcf11a7d04df6ec3db81912d /system/database/DB.php
parent2e430a3f3b160641c36037fbaf92457e0b3bb51e (diff)
parentde7da338e21885b9ecc4f5a64ba77ee8475960d2 (diff)
Merge remote-tracking branch 'upstream/develop' into develop-db-cubrid
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)) : ''