summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-12 19:44:03 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-12 19:44:03 +0200
commit98ebf4351f8aad58504cd7318ddd94faf0dec482 (patch)
tree229b190e9059e545fc62de85708afc7b148c0b66 /system/database
parent2f8bf9b4c5ee9bc183e17fd36b54be12a1bf75bb (diff)
Fix mysql's db_connect()
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/mysql/mysql_driver.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 336db971d..99bf55942 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -81,7 +81,6 @@ class CI_DB_mysql_driver extends CI_DB {
*/
public function db_connect($persistent = FALSE)
{
- $connect_func = ($persistent === TRUE) ? 'mysql_pconnect' : 'mysql_connect';
$client_flags = ($this->compress === FALSE) ? 0 : MYSQL_CLIENT_COMPRESS;
if ($this->encrypt === TRUE)
@@ -89,7 +88,9 @@ class CI_DB_mysql_driver extends CI_DB {
$client_flags = $client_flags | MYSQL_CLIENT_SSL;
}
- return @$connect_func($this->hostname, $this->username, $this->password, TRUE, $client_flags);
+ return ($persistent === TRUE)
+ ? @mysql_pconnect($this->hostname, $this->username, $this->password, $client_flags)
+ : @mysql_connect($this->hostname, $this->username, $this->password, TRUE, $client_flags);
}
// --------------------------------------------------------------------