diff options
| author | czaks <marcin@6irc.net> | 2013-08-28 20:34:06 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-28 20:34:06 -0400 |
| commit | b95840adcb9c5d76952a7e13a9ac3ac190948f03 (patch) | |
| tree | 1ffc0e541564d7c200ab31146a0366c68ce0b4cb /inc/template.php | |
| parent | a1d9de205bbfc4be2385dad5bf16e4478b62f236 (diff) | |
| parent | 90eb8f1f3765afc848f7a3f7f12d83a46fe9e92f (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
inc/functions.php
Diffstat (limited to 'inc/template.php')
| -rw-r--r-- | inc/template.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/template.php b/inc/template.php index ef688944..6f85e78b 100644 --- a/inc/template.php +++ b/inc/template.php @@ -47,7 +47,9 @@ function Element($templateFile, array $options) { if (isset($options['body']) && $config['debug']) { if (isset($debug['start'])) { $debug['time'] = '~' . round((microtime(true) - $debug['start']) * 1000, 2) . 'ms'; + $debug['time (initialization)'] = '~' . round(($debug['start_debug'] - $debug['start']) * 1000, 2) . 'ms'; unset($debug['start']); + unset($debug['start_debug']); } $debug['included'] = get_included_files(); $debug['memory'] = round(memory_get_usage(true) / (1024 * 1024), 2) . ' MiB'; |