Fix mysql_pconnect function

(There's no $new_link parameter!)

1 files changed, 10 insertions, 13 deletions

diff --git a/mysql.php b/mysql.php
index e4ffcba..7811b6f 100644
--- a/mysql.php
+++ b/mysql.php
@@ -72,12 +72,9 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) {
 	 * @param $password
 	 * @return mysqli|null
 	 */
-	function mysql_pconnect($server, $username, $password, $new_link = false, $client_flags = 0)
+	function mysql_pconnect($server, $username, $password, $client_flags = 0)
 	{
-		global $__MYSQLI_WRAPPER_LINK;
-
-		$__MYSQLI_WRAPPER_LINK = mysqli_connect('p:' . $server, $username, $password);
-		return $__MYSQLI_WRAPPER_LINK;
+		return mysql_connect('p:' . $server, $username, $password, false, $client_flags);
 	}
 
 	/**
@@ -108,7 +105,7 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) {
 	{
 		return getLinkIdentifier($mysqli)->escape_string($string);
 	}
-	
+
 	/**
 	 * @param $string
 	 * @return string
@@ -229,7 +226,7 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) {
 	{
 	    mysqli_data_seek($result,$row);
 	    $f = mysqli_fetch_row($result);
-	    
+
 	    return $f[0];
 	}
 
@@ -414,7 +411,7 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) {
 	{
 	    mysqli_data_seek($result, $row);
 	    $f = mysqli_fetch_array($result);
-	    
+
 	    return $f[0];
 	}
 
@@ -654,23 +651,23 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) {
 	function mysql_field_flags(mysqli_result $result , $field_offset = 0)
 	{
 	    $flags_num = mysqli_fetch_field_direct($result,$field_offset)->flags;
-	    
+
 	    if (!isset($flags))
 	    {
 	        $flags = array();
 	        $constants = get_defined_constants(true);
 	        foreach ($constants['mysqli'] as $c => $n) if (preg_match('/MYSQLI_(.*)_FLAG$/', $c, $m)) if (!array_key_exists($n, $flags)) $flags[$n] = $m[1];
 	    }
-	    
+
 	    $result = array();
 	    foreach ($flags as $n => $t) if ($flags_num & $n) $result[] = $t;
-	    
+
 	    $return = implode(' ', $result);
 	    $return = str_replace('PRI_KEY','PRIMARY_KEY',$return);
 	    $return = strtolower($return);
-	    
+
 	    return $return;
-	} 
+	}
 
 	/**
 	 * Set result pointer to a specified field offset