diff options
| author | Sjoerd Maessen <github@sjoerdmaessen.nl> | 2020-01-09 18:38:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 18:38:00 +0100 |
| commit | 352eec391f862f4502a3023207da961429781def (patch) | |
| tree | 7584604886f6bf7aa18ac1f4361cb89c34a69397 | |
| parent | 940195440650f2083c9e90ef81e2f52e0cf82489 (diff) | |
| parent | ef0f71e9ee2021a8eafda2c77c0a336178d57d80 (diff) | |
| download | php-mysql-mysqli-wrapper-352eec391f862f4502a3023207da961429781def.zip php-mysql-mysqli-wrapper-352eec391f862f4502a3023207da961429781def.tar.gz php-mysql-mysqli-wrapper-352eec391f862f4502a3023207da961429781def.tar.bz2 | |
Merge pull request #6 from opcode81/link-var
Fix use of common global variable name $link
| -rw-r--r-- | mysql.php | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -30,7 +30,7 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) { define('MYSQL_BOTH', MYSQLI_BOTH); // Will contain the link identifier - $link = null; + $__MYSQLI_WRAPPER_LINK = null; /** * Get the link identifier @@ -41,8 +41,8 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) { function getLinkIdentifier(mysqli $mysqli = null) { if (!$mysqli) { - global $link; - $mysqli = $link; + global $__MYSQLI_WRAPPER_LINK; + $mysqli = $__MYSQLI_WRAPPER_LINK; } return $mysqli; @@ -58,10 +58,10 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) { */ function mysql_connect($server, $username, $password, $new_link = false, $client_flags = 0) { - global $link; + global $__MYSQLI_WRAPPER_LINK; - $link = mysqli_connect($server, $username, $password); - return $link; + $__MYSQLI_WRAPPER_LINK = mysqli_connect($server, $username, $password); + return $__MYSQLI_WRAPPER_LINK; } /** @@ -74,10 +74,10 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) { */ function mysql_pconnect($server, $username, $password, $new_link = false, $client_flags = 0) { - global $link; + global $__MYSQLI_WRAPPER_LINK; - $link = mysqli_connect('p:' . $server, $username, $password); - return $link; + $__MYSQLI_WRAPPER_LINK = mysqli_connect('p:' . $server, $username, $password); + return $__MYSQLI_WRAPPER_LINK; } /** @@ -86,9 +86,9 @@ if (!extension_loaded('mysql') && !function_exists('mysql_connect')) { */ function mysql_select_db($databaseName) { - global $link; + global $__MYSQLI_WRAPPER_LINK; - return mysqli_select_db($link, $databaseName); + return mysqli_select_db($__MYSQLI_WRAPPER_LINK, $databaseName); } /** |