summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-13 04:40:25 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-13 04:40:25 +0100
commitfe4b4e9d5f5c19da77c8e675f33f030766019ac3 (patch)
treee6575c081a036bcc46cfa447eafb8ce67c979f16 /system/database
parent36cd531e9874d32a272088838055bdd56045c41b (diff)
Fix pconnect with DSN
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/cubrid/cubrid_driver.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php
index a0d874a8c..8d5344af9 100644
--- a/system/database/drivers/cubrid/cubrid_driver.php
+++ b/system/database/drivers/cubrid/cubrid_driver.php
@@ -122,9 +122,10 @@ class CI_DB_cubrid_driver extends CI_DB {
{
if (preg_match('/^CUBRID:[^:]+(:[0-9][1-9]{0,4})?:[^:]+:([^:]*):([^:]*):(\?.+)?$/', $this->dsn, $matches))
{
+ $_temp = ($persistent !== TRUE) ? 'cubrid_connect_with_url' : 'cubrid_pconnect_with_url';
$conn_id = ($matches[2] === '' && $matches[3] === '' && $this->username !== '' && $this->password !== '')
- ? cubrid_connect_with_url($this->dsn, $this->username, $this->password)
- : cubrid_connect_with_url($this->dsn);
+ ? $_temp($this->dsn, $this->username, $this->password)
+ : $_temp($this->dsn);
}
else
{