aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-22 23:13:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-22 23:13:14 +0200
commitd18d3b30c70c0fb48cad14576376ee51671d094e (patch)
tree8f4e973dde14b1e7ed08e64b3ae294ebdd073b8d /phpBB/includes/functions.php
parent4f6255687e53105b68d8b751b343f307a6968b51 (diff)
parentde04304e94c428afd6dcb9f42b215ebbb6cc14d2 (diff)
downloadforums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar.gz
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar.bz2
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.tar.xz
forums-d18d3b30c70c0fb48cad14576376ee51671d094e.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12704] Improve the load time information in the footer when enabled
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3d0a4761f3..32acb0c9ff 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5064,10 +5064,10 @@ function phpbb_generate_debug_output(phpbb\db\driver\driver_interface $db, \phpb
if (isset($GLOBALS['starttime']))
{
$totaltime = microtime(true) - $GLOBALS['starttime'];
- $debug_info[] = sprintf('Time: %.3fs', $totaltime);
+ $debug_info[] = sprintf('<abbr title="SQL time: %.3fs / PHP time: %.3fs">Time: %.3fs</abbr>', $db->sql_time, ($totaltime - $db->sql_time), $totaltime);
}
- $debug_info[] = $db->sql_num_queries() . ' Queries (' . $db->sql_num_queries(true) . ' cached)';
+ $debug_info[] = sprintf('<abbr title="Cached: %d">Queries: %d</abbr>', $db->sql_num_queries(true), $db->sql_num_queries());
$memory_usage = memory_get_peak_usage();
if ($memory_usage)