PDO: Handle PHP warnings for internal queries

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8793bfb19148ea3224ce44b328dfb1ddc05c56e..d05467e48352c216fcda3e3f83c981afb89a73f9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - Display collation at table structure if different from table
 - Ctrl+click in select moves the cursor in modern browsers
 - URL parameter ?ext=pdo to force using PDO
+- PDO: Handle PHP warnings for internal queries
 - PostgreSQL: Display auto_increment of inserted rows
 - PostgreSQL: Display description of system variables
 - PostgreSQL: Avoid warning about crdb_version (bug #924, regression from 5.0.5)

diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index 6cda3ae0e87d2c79adbccb0fa624ac416ccbed52..e8fb0d12d8c7edd239131a4bddc17492fcb7a246 100644 (file)
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -72,7 +72,7 @@ if (extension_loaded('pdo')) {
                                return false;
                        }
                        $row = $result->fetch();
-                       return $row[$field];
+                       return $row ? $row[$field] : false;
                }
        }