From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 31 Jan 2011 14:49:07 +0000 (+0100)
Subject: Avoid fatal error (bug #3110257)
X-Git-Tag: v3.2.0~49
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=e26b1864e354a4f66bf5f15e15c695bf14b73fe8;p=adminer.git

Avoid fatal error (bug #3110257)
---

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index edb426ec..aff62aac 100644
--- 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;
 }