Report errors only in primary connection

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index efb637e410ce56d61209695c38ef0cb86541b802..36b6a451c94f5dd09512456ddaaaebb8635522b4 100644 (file)
--- 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 cb92a7893e5d5eaf8d40e42d163f82346e33ee0f..1ec5d7dde139dac981dd4b6774e8ee06c2769cac 100644 (file)
--- 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;