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

Print warnings in call

Browse Source
This commit is contained in:
Jakub Vrana
2018-02-01 11:58:04 +01:00
parent d667f585e0
commit be75939344
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adminer/call.inc.php
View File

@@ -30,9 +30,11 @@ if (!$error && $_POST) {
} }
$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")"; $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"; echo "<p class='error'>" . error() . "\n";
} else { } else {
$connection2 = connect(); $connection2 = connect();

2
adminer/include/adminer.inc.php
View File

@@ -207,7 +207,7 @@ class Adminer {
*/ */
function selectQuery($query, $start) { function selectQuery($query, $start) {
global $jush, $driver; 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>" : "") . (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
; ;
$print = "</p>\n"; // required for IE9 inline edit $print = "</p>\n"; // required for IE9 inline edit