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

Simplify format_time()

Browse Source
This commit is contained in:
Jakub Vrana
2013-08-08 17:18:39 -07:00
parent 85d212c226
commit 28856804a4
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
adminer/include/functions.inc.php
View File

@@ -522,9 +522,9 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
global $connection, $error, $adminer;
$time = "";
if ($execute) {
$start = microtime();
$start = microtime(true);
$failed = !$connection->query($query);
$time = "; -- " . format_time($start, microtime());
$time = "; -- " . format_time($start, microtime(true));
}
$sql = "";
if ($query) {
@@ -551,10 +551,10 @@ function queries($query = null) {
// return executed queries without parameter
return implode("\n", $queries);
}
$start = microtime();
$start = microtime(true);
$return = $connection->query($query);
$queries[] = (preg_match('~;$~', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query)
. "; -- " . format_time($start, microtime());
. "; -- " . format_time($start, microtime(true));
return $return;
}
@@ -584,12 +584,12 @@ function queries_redirect($location, $message, $redirect) {
}
/** Format time difference
* @param string output of microtime()
* @param string output of microtime()
* @param string output of microtime(true)
* @param string output of microtime(true)
* @return string HTML code
*/
function format_time($start, $end) {
return lang('%.3f s', max(0, array_sum(explode(" ", $end)) - array_sum(explode(" ", $start))));
return lang('%.3f s', max(0, $end - $start));
}
/** Remove parameter from query string