From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 17 Dec 2010 17:22:06 +0000 (+0100)
Subject: Report errors only in primary connection
X-Git-Tag: v3.2.0~88
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=0449351a60f7cdb869d0a4ea45e46b236054ab12;p=adminer.git

Report errors only in primary connection
---

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index efb637e4..36b6a451 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -2,6 +2,7 @@
 /** Print select result
 * @param Min_Result
 * @param Min_DB connection to examine indexes
+* @param string base link for <th> fields
 * @return null
 */
 function select($result, $connection2 = null, $href = "") {
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index cb92a789..1ec5d7dd 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -216,7 +216,7 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 		while ($row = $result->fetch_assoc()) {
 			$return[] = $row;
 		}
-	} elseif (!$result && $error && defined("PAGE_HEADER")) {
+	} elseif ($connection->error && $error && defined("PAGE_HEADER")) {
 		echo $error . error() . "\n";
 	}
 	return $return;