mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-13 10:04:07 +02:00
Code Issues Releases Wiki Activity

Don't print error message with no error (bug #3118538)

Browse Source
This commit is contained in:
Jakub Vrana
2010-11-26 14:13:38 +01:00
parent 50bb1f8d84
commit 8c10fc05f4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
adminer/sql.inc.php
View File

@@ -78,14 +78,7 @@ if (!$error && $_POST) {
} }
$start = explode(" ", microtime()); // microtime(true) is available since PHP 5 $start = explode(" ", microtime()); // microtime(true) is available since PHP 5
//! don't allow changing of character_set_results, convert encoding of displayed query //! don't allow changing of character_set_results, convert encoding of displayed query
if (!$connection->multi_query($q)) { if ($connection->multi_query($q)) {
echo ($_POST["only_errors"] ? $print : "");
echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
$errors[] = " <a href='#sql-$commands'>$commands</a>";
if ($_POST["error_stops"]) {
break;
}
} else {
if (is_object($connection2) && preg_match("~^$space*(USE)\\b~isU", $q)) { if (is_object($connection2) && preg_match("~^$space*(USE)\\b~isU", $q)) {
$connection2->query($q); $connection2->query($q);
} }
@@ -119,6 +112,13 @@ if (!$error && $_POST) {
} }
$start = $end; $start = $end;
} while ($connection->next_result()); } while ($connection->next_result());
} elseif ($connection->error) {
echo ($_POST["only_errors"] ? $print : "");
echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
$errors[] = " <a href='#sql-$commands'>$commands</a>";
if ($_POST["error_stops"]) {
break;
}
} }
$query = substr($query, $offset); $query = substr($query, $offset);
$offset = 0; $offset = 0;