From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 1 Feb 2018 10:58:04 +0000 (+0100)
Subject: Print warnings in call
X-Git-Tag: v4.6.0~34
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=be7593934476eb4dc8e489bc928626e027ef4d14;p=adminer.git

Print warnings in call
---

diff --git a/adminer/call.inc.php b/adminer/call.inc.php
index 9ceb398f..3f639a0c 100644
--- a/adminer/call.inc.php
+++ b/adminer/call.inc.php
@@ -30,9 +30,11 @@ if (!$error && $_POST) {
 	}
 	
 	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
-	echo "<p><code class='jush-$jush'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
+	$start = microtime(true);
+	$result = $connection->multi_query($query);
+	echo $adminer->selectQuery($query, $start);
 	
-	if (!$connection->multi_query($query)) {
+	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
 		$connection2 = connect();
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 3a01c85a..19a88d42 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -207,7 +207,7 @@ class Adminer {
 	*/
 	function selectQuery($query, $start) {
 		global $jush, $driver;
-		$return = "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($time) . ")</span>"
+		$return = "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
 			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
 		;
 		$print = "</p>\n"; // required for IE9 inline edit