Fix mysql's db_connect()

bcit-ci · Oct 12, 2012 · 98ebf43 · 98ebf43
1 parent 2f8bf9b
commit 98ebf43
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
@@ -81,15 +81,16 @@ public function __construct($params)
 	 */
 	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)
 		{
 			$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);
 	}
 
 	// --------------------------------------------------------------------