makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12687] Return a string and move the displaying of the sql report

Browse source 
PHPBB3-12687
This commit is contained in:
Tristan Darricau 2014-06-12 14:33:00 +02:00
parent 06e6c91513
commit ceef85ee0e
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/includes/functions.php
View file

@ -5030,16 +5030,24 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
} }
/** /**
* Set the DEBUG_OUTPUT template var * Check and display the SQL report if requested.
*/ */
function display_debug_output() function phpbb_check_and_display_sql_report()
{ {
global $starttime, $template, $db, $config, $auth, $user, $request; global $request, $auth, $db;
if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report')) if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report'))
{ {
$db->sql_report('display'); $db->sql_report('display');
} }
}
/**
* Set the DEBUG_OUTPUT template var
*/
function phpbb_generate_debug_output()
{
global $starttime, $db, $config, $auth, $user;
$debug_info = array(); $debug_info = array();
@ -5052,11 +5060,10 @@ function display_debug_output()
$debug_info[] = sprintf('Time : %.3fs', $totaltime); $debug_info[] = sprintf('Time : %.3fs', $totaltime);
$debug_info[] = $db->sql_num_queries() . ' Queries'; $debug_info[] = $db->sql_num_queries() . ' Queries';
if ($auth->acl_get('a_'))
{
if (function_exists('memory_get_peak_usage')) if (function_exists('memory_get_peak_usage'))
{ {
if ($memory_usage = memory_get_peak_usage()) $memory_usage = memory_get_peak_usage();
if ($memory_usage)
{ {
$memory_usage = get_formatted_filesize($memory_usage); $memory_usage = get_formatted_filesize($memory_usage);
@ -5064,7 +5071,6 @@ function display_debug_output()
} }
} }
} }
}
if (defined('DEBUG')) if (defined('DEBUG'))
{ {
@ -5077,13 +5083,11 @@ function display_debug_output()
if ($auth->acl_get('a_')) if ($auth->acl_get('a_'))
{ {
$debug_info[] = '<a href="' . build_url() . '&amp;explain=1">Explain</a>'; $debug_info[] = '<a href="' . build_url() . '&amp;explain=1">SQL Explain</a>';
} }
} }
$template->assign_vars(array( return implode(' | ', $debug_info);
'DEBUG_OUTPUT' => implode(' | ', $debug_info),
));
} }
/** /**
@ -5118,9 +5122,10 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
return; return;
} }
display_debug_output(); phpbb_check_and_display_sql_report();
$template->assign_vars(array( $template->assign_vars(array(
'DEBUG_OUTPUT' => phpbb_generate_debug_output(),
'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'), 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'),

3
phpBB/includes/functions_acp.php
View file

@ -146,9 +146,10 @@ function adm_page_footer($copyright_html = true)
return; return;
} }
display_debug_output(); phpbb_check_and_display_sql_report();
$template->assign_vars(array( $template->assign_vars(array(
'DEBUG_OUTPUT' => phpbb_generate_debug_output(),
'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
'S_COPYRIGHT_HTML' => $copyright_html, 'S_COPYRIGHT_HTML' => $copyright_html,
'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'), 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'),