Browse files

Save bytes

  • Loading branch information...
1 parent 0d427ad commit 0060c608d68c28d55c763582b509b64c6166425d @vrana committed Jun 22, 2011
Showing with 7 additions and 7 deletions.
  1. +3 −3 adminer/include/editing.inc.php
  2. +4 −4 adminer/sql.inc.php
View
6 adminer/include/editing.inc.php
@@ -118,12 +118,12 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
}
/** Format time difference
-* @param array ($sec, $sec)
-* @param array ($sec, $sec)
+* @param string output of microtime()
+* @param string output of microtime()
* @return string HTML code
*/
function format_time($start, $end) {
- return " <span class='time'>(" . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . ")</span>";
+ return " <span class='time'>(" . lang('%.3f s', max(0, array_sum(explode(" ", $end)) - array_sum(explode(" ", $start)))) . ")</span>";
}
/** Print table columns for type edit
View
8 adminer/sql.inc.php
@@ -52,7 +52,7 @@
$commands = 0;
$errors = array();
$parse = '[\'`"]' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : ($jush == "mssql" || $jush == "sqlite" ? '|\\[' : '')) . '|/\\*|-- |#'; //! ` and # not everywhere
- $total_start = explode(" ", microtime());
+ $total_start = microtime();
parse_str($_COOKIE["adminer_export"], $adminer_export);
$dump_format = $adminer->dumpFormat();
unset($dump_format["sql"]);
@@ -90,14 +90,14 @@
ob_flush();
flush(); // can take a long time - show the running query
}
- $start = explode(" ", microtime()); // microtime(true) is available since PHP 5
+ $start = microtime(); // microtime(true) is available since PHP 5
//! don't allow changing of character_set_results, convert encoding of displayed query
if ($connection->multi_query($q) && is_object($connection2) && preg_match("~^$space*USE\\b~isU", $q)) {
$connection2->query($q);
}
do {
$result = $connection->store_result();
- $end = explode(" ", microtime());
+ $end = microtime();
$time = format_time($start, $end) . (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
if ($connection->error) {
echo ($_POST["only_errors"] ? $print : "");
@@ -150,7 +150,7 @@
if ($empty) {
echo "<p class='message'>" . lang('No commands to execute.') . "\n";
} elseif ($_POST["only_errors"]) {
- echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors)) . format_time($total_start, explode(" ", microtime())) . "\n";
+ echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors)) . format_time($total_start, microtime()) . "\n";
} elseif ($errors && $commands > 1) {
echo "<p class='error'>" . lang('Error in query') . ": " . implode("", $errors) . "\n";
}

0 comments on commit 0060c60

Please sign in to comment.