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

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 81be8728c6565e57916d7d6ab11543bab5cab405..e630c3c7057e4d743f3b10d17911a92f684ea570 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -78,14 +78,7 @@ if (!$error && $_POST) {
                                                }
                                                $start = explode(" ", microtime()); // microtime(true) is available since PHP 5
                                                //! don't allow changing of character_set_results, convert encoding of displayed query
-                                               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 ($connection->multi_query($q)) {
                                                        if (is_object($connection2) && preg_match("~^$space*(USE)\\b~isU", $q)) {
                                                                $connection2->query($q);
                                                        }
@@ -119,6 +112,13 @@ if (!$error && $_POST) {
                                                                }
                                                                $start = $end;
                                                        } 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);
                                                $offset = 0;