diff --git a/adminer/drivers/elastic.inc.php b/adminer/drivers/elastic.inc.php index 2f8fd276..00be4325 100644 --- a/adminer/drivers/elastic.inc.php +++ b/adminer/drivers/elastic.inc.php @@ -148,7 +148,7 @@ if (isset($_GET["elastic"])) { $start = microtime(true); $search = $this->_conn->query($query, $data); if ($print) { - echo $adminer->selectQuery("$query: " . print_r($data, true), format_time($start)); + echo $adminer->selectQuery("$query: " . print_r($data, true), $start); } if (!$search) { return false; diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index c28881e9..3a01c85a 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -202,12 +202,12 @@ class Adminer { /** Query printed in select before execution * @param string query to be executed - * @param string elapsed time + * @param float start time of the query * @return string */ - function selectQuery($query, $time) { + function selectQuery($query, $start) { global $jush, $driver; - $return = "

" . h(str_replace("\n", " ", $query)) . " ($time)" + $return = "

" . h(str_replace("\n", " ", $query)) . " (" . format_time($time) . ")" . (support("sql") ? " " . lang('Edit') . "" : "") ; $print = "

\n"; // required for IE9 inline edit diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php index 2c66a363..1963390a 100644 --- a/adminer/include/driver.inc.php +++ b/adminer/include/driver.inc.php @@ -37,7 +37,7 @@ $start = microtime(true); $return = $this->_conn->query($query); if ($print) { - echo $adminer->selectQuery($query, format_time($start)); + echo $adminer->selectQuery($query, $start); } return $return; } diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index 1da44c47..4fec8a90 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -140,8 +140,8 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5 } } - function selectQuery($query, $time) { - return "\n"; + function selectQuery($query, $start) { + return "\n"; } function rowDescription($table) { diff --git a/plugins/plugin.php b/plugins/plugin.php index 11aca9aa..9617fe5b 100644 --- a/plugins/plugin.php +++ b/plugins/plugin.php @@ -182,7 +182,7 @@ class AdminerPlugin extends Adminer { return $this->_applyPlugin(__FUNCTION__, $args); } - function selectQuery($query, $time) { + function selectQuery($query, $start) { $args = func_get_args(); return $this->_applyPlugin(__FUNCTION__, $args); }