Avoid fatal error (bug #3110257)

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index edb426ec25543ee3f71bacb7ad061a67be69474e..aff62aac3c73dc0ad5f77e2f6c16d99529def79f 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -210,8 +210,10 @@ function get_key_vals($query, $connection2 = null) {
        }
        $return = array();
        $result = $connection2->query($query);
-       while ($row = $result->fetch_row()) {
-               $return[$row[0]] = $row[1];
+       if (is_object($result)) {
+               while ($row = $result->fetch_row()) {
+                       $return[$row[0]] = $row[1];
+               }
        }
        return $return;
 }