diff options
author | Davey Shafik <me@daveyshafik.com> | 2020-08-11 17:37:58 +0000 |
---|---|---|
committer | Davey Shafik <me@daveyshafik.com> | 2020-08-11 17:37:58 +0000 |
commit | 5ae66da8c47b4c1aa08a16411fc6cf1806671072 (patch) | |
tree | b43438e961f39e6d96f67f6df8d836c6a0a784b2 /lib/mysql.php | |
parent | a764528d59b24550c71c34ec67ebb68d00daae29 (diff) | |
parent | 97688a6f874e67cbd967392c0086db241f203683 (diff) | |
download | php7-mysql-shim-5ae66da8c47b4c1aa08a16411fc6cf1806671072.zip php7-mysql-shim-5ae66da8c47b4c1aa08a16411fc6cf1806671072.tar.gz php7-mysql-shim-5ae66da8c47b4c1aa08a16411fc6cf1806671072.tar.bz2 |
Merge branch 'master' of https://github.com/dshafik/php7-mysql-shim
Diffstat (limited to 'lib/mysql.php')
-rw-r--r-- | lib/mysql.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/mysql.php b/lib/mysql.php index 527ba3b..924d68f 100644 --- a/lib/mysql.php +++ b/lib/mysql.php @@ -40,6 +40,10 @@ namespace { $new = false, $flags = 0 ) { + if ($new !== false) { + trigger_error('Argument $new is no longer supported in PHP > 7', E_USER_WARNING); + } + if (null === $hostname) { $hostname = ini_get('mysqli.default_host') ?: null; } @@ -53,7 +57,7 @@ namespace { $hash = sha1($hostname . $username . $flags); /* persistent connections start with p: */ /* don't use a cached link for those */ - if (!$new && $hostname[1] !== ':' && isset(\Dshafik\MySQL::$connections[$hash])) { + if ($hostname[1] !== ':' && isset(\Dshafik\MySQL::$connections[$hash])) { \Dshafik\MySQL::$last_connection = \Dshafik\MySQL::$connections[$hash]['conn']; \Dshafik\MySQL::$connections[$hash]['refcount'] += 1; return \Dshafik\MySQL::$connections[$hash]['conn']; |