diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-10 18:24:58 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-06-11 14:27:11 +0200 |
| commit | 06e6c915134d11db906d0275c2a75a6280a07ab6 (patch) | |
| tree | 69a09cfc86f52a97911303176da80834284ccb69 /phpBB/includes/functions_acp.php | |
| parent | 1e769ba87f3b2d510ad82e11e971fc2abcf8a8d0 (diff) | |
| download | forums-06e6c915134d11db906d0275c2a75a6280a07ab6.tar forums-06e6c915134d11db906d0275c2a75a6280a07ab6.tar.gz forums-06e6c915134d11db906d0275c2a75a6280a07ab6.tar.bz2 forums-06e6c915134d11db906d0275c2a75a6280a07ab6.tar.xz forums-06e6c915134d11db906d0275c2a75a6280a07ab6.zip | |
[ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME
PHPBB3-12687
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 357832794d..86eaf856de 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -146,43 +146,9 @@ function adm_page_footer($copyright_html = true) return; } - // Output page creation time - if (defined('DISPLAY_LOAD_TIME')) - { - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report')) - { - $db->sql_report('display'); - } - - $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); - - if ($auth->acl_get('a_')) - { - if (defined('DISPLAY_LOAD_TIME')) - { - if (function_exists('memory_get_peak_usage')) - { - if ($memory_usage = memory_get_peak_usage()) - { - $memory_usage = get_formatted_filesize($memory_usage); - - $debug_output .= ' | Peak Memory Usage: ' . $memory_usage; - } - } - } - - if (defined('DEBUG')) - { - $debug_output .= ' | <a href="' . build_url() . '&explain=1">Explain</a>'; - } - } - } + display_debug_output(); $template->assign_vars(array( - 'DEBUG_OUTPUT' => (defined('DISPLAY_LOAD_TIME')) ? $debug_output : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Limited'), |