From 6bcbb0f1d89cc51b2f1cdbae6a28856053c9f961 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 6 Jan 2012 00:56:30 -0800 Subject: [PATCH] Don't report previous error on primary connection --- adminer/include/functions.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index e49b2501..2d5d897b 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -282,20 +282,20 @@ function get_key_vals($query, $connection2 = null) { /** Get all rows of result * @param string +* @param Min_DB +* @param string * @return array associative */ function get_rows($query, $connection2 = null, $error = "

") { global $connection; - if (!is_object($connection2)) { - $connection2 = $connection; - } + $conn = (is_object($connection2) ? $connection2 : $connection); $return = array(); - $result = $connection2->query($query); + $result = $conn->query($query); if (is_object($result)) { // can return true while ($row = $result->fetch_assoc()) { $return[] = $row; } - } elseif (!$result && $connection->error && $error && defined("PAGE_HEADER")) { + } elseif (!$result && !is_object($connection2) && $error && defined("PAGE_HEADER")) { echo $error . error() . "\n"; } return $return;