From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 1 Feb 2018 10:43:44 +0000 (+0100)
Subject: Return string from warnings()
X-Git-Tag: v4.6.0~37
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=e9add6d985446171b762d09dd921ef54fd512f3d;p=adminer.git

Return string from warnings()
---

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 8eba872c..890a6aaa 100644
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -278,7 +278,12 @@ if (!defined("DRIVER")) {
 		}
 		
 		function warnings() {
-			return $this->_conn->query("SHOW WARNINGS");
+			$result = $this->_conn->query("SHOW WARNINGS");
+			if ($result && $result->num_rows) {
+				ob_start();
+				select($result); // select() usually needs to print a big table progressively
+				return ob_get_clean();
+			}
 		}
 
 	}
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 0d66ac48..c28881e9 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -212,12 +212,10 @@ class Adminer {
 		;
 		$print = "</p>\n"; // required for IE9 inline edit
 		$warnings = $driver->warnings();
-		if ($warnings && $warnings->num_rows) {
+		if ($warnings) {
 			$id = "warnings";
-			ob_start();
-			select($warnings); // select() usually needs to print a big table progressively
 			$return .= ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
-				. "$print<div id='$id' class='hidden'>\n" . ob_get_clean() . "</div>\n"
+				. "$print<div id='$id' class='hidden'>\n$warnings</div>\n"
 			;
 		} else {
 			$return .= $print;
@@ -629,16 +627,13 @@ class Adminer {
 		$return = " <span class='time'>" . @date("H:i:s") . "</span>"; // @ - time zone may be not set
 		$warnings = $driver->warnings();
 		$print = "";
-		if ($warnings && $warnings->num_rows) {
+		if ($warnings) {
 			$id = "warnings-" . count($history[$_GET["db"]]);
 			$return .= " <a href='#$id' class='toggle'>" . lang('Warnings') . "</a>,";
-			ob_start();
-			select($warnings); // select() usually needs to print a big table progressively
-			$print = "<div id='$id' class='hidden'>\n" . ob_get_clean() . "</div>\n";
+			$print = "<div id='$id' class='hidden'>\n$warnings</div>\n";
 		}
 		$id = "sql-" . count($history[$_GET["db"]]);
-		return $return
-			. " <a href='#$id' class='toggle'>" . lang('SQL command') . "</a>"
+		return "$return <a href='#$id' class='toggle'>" . lang('SQL command') . "</a>"
 			. $print
 			. "<div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre>'
 			. ($time ? " <span class='time'>($time)</span>" : '')
diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index a6d1afcd..2c66a363 100644
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -114,10 +114,10 @@
 	}
 	
 	/** Get warnings about the last command
-	* @return Min_Result or false
+	* @return string HTML
 	*/
 	function warnings() {
-		return false;
+		return '';
 	}
 	
 }
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index c5a27146..175a80bd 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -130,9 +130,9 @@ if (!$error && $_POST) {
 									$time = " <span class='time'>(" . format_time($start) . ")</span>"
 										. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
 									;
-									$warnings = $driver->warnings();
-									$warnings_id = "warnings-$commands";
-									if ($warnings && $warnings->num_rows) {
+									$warnings = ($_POST["only_errors"] ? "" : $driver->warnings());
+									if ($warnings) {
+										$warnings_id = "warnings-$commands";
 										$time .= ", <a href='#$warnings_id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$warnings_id');", "");
 									}
 									$explain = null;
@@ -168,11 +168,7 @@ if (!$error && $_POST) {
 											echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
 										}
 									}
-									if ($warnings && $warnings->num_rows && !$_POST["only_errors"]) {
-										echo "<div id='$warnings_id' class='hidden'>\n";
-										select($warnings);
-										echo "</div>\n";
-									}
+									echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
 									if ($explain) {
 										echo "<div id='$explain_id' class='hidden'>\n";
 										select($explain, $connection2, $orgtables);