Changeset 756 for branches/1.1dev/polyfill/mysql.inc.php

Timestamp:

Nov 16, 2021 8:30:58 AM (2 years ago)

Author:

anonymous

Message:

Backport utility functions from v2.x

File:

• branches/1.1dev/polyfill/mysql.inc.php (modified) (3 diffs)

branches/1.1dev/polyfill/mysql.inc.php

@@ -176 +176 @@
             try {
                 // Add instance
-                $this->_instances[$usePosition] = new Pdo($dsn, $username, $password, $flags);
+                $this->_instances[$usePosition] = new PDO($dsn, $username, $password, $flags);
 
                 return $usePosition;
@@ -211 +211 @@
             try {
                 $this->_params[$link]['databaseName'] = $databaseName;
-                return $this->mysql_query("USE {$databaseName}", $link);
+                return $this->mysql_query("USE `{$databaseName}`", $link);
             } catch (PDOException $e) {
                 return false;
@@ -265 +265 @@
             static $last = null;
 
-            if ($result === false) {
+            if ($result === false || $result === null) {
                 trigger_error('mysql_fetch_*(): supplied argument is not a valid MySQL result resource', E_USER_WARNING);
                 return false;