beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't report previous error on primary connection

Browse source
This commit is contained in:
Jakub Vrana 2012-01-06 00:56:30 -08:00
parent 41e197ac06
commit 6bcbb0f1d8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adminer/include/functions.inc.php
View file

@ -282,20 +282,20 @@ function get_key_vals($query, $connection2 = null) {
/** Get all rows of result /** Get all rows of result
* @param string * @param string
* @param Min_DB
* @param string
* @return array associative * @return array associative
*/ */
function get_rows($query, $connection2 = null, $error = "<p class='error'>") { function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
global $connection; global $connection;
if (!is_object($connection2)) { $conn = (is_object($connection2) ? $connection2 : $connection);
$connection2 = $connection;
}
$return = array(); $return = array();
$result = $connection2->query($query); $result = $conn->query($query);
if (is_object($result)) { // can return true if (is_object($result)) { // can return true
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
$return[] = $row; $return[] = $row;
} }
} elseif (!$result && $connection->error && $error && defined("PAGE_HEADER")) { } elseif (!$result && !is_object($connection2) && $error && defined("PAGE_HEADER")) {
echo $error . error() . "\n"; echo $error . error() . "\n";
} }
return $return; return $return;