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

[ticket/12687] Remove globals

Browse source 
PHPBB3-12687
This commit is contained in:
Tristan Darricau 2014-06-12 23:27:19 +02:00
parent ceef85ee0e
commit 6c0fd61b1d
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/functions.php
View file

@ -5032,10 +5032,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
/**
* Check and display the SQL report if requested.
*/
function phpbb_check_and_display_sql_report()
function phpbb_check_and_display_sql_report($request, $auth, $db)
{
global $request, $auth, $db;
if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report'))
{
$db->sql_report('display');
@ -5043,19 +5041,17 @@ function phpbb_check_and_display_sql_report()
}
/**
* Set the DEBUG_OUTPUT template var
* Generate the debug output string
*/
function phpbb_generate_debug_output()
function phpbb_generate_debug_output($db, $config, $auth, $user)
{
global $starttime, $db, $config, $auth, $user;
$debug_info = array();
// Output page creation time
if (defined('PHPBB_DISPLAY_LOAD_TIME'))
{
$mtime = explode(' ', microtime());
$totaltime = $mtime[0] + $mtime[1] - $starttime;
$totaltime = $mtime[0] + $mtime[1] - $GLOBALS['starttime'];
$debug_info[] = sprintf('Time : %.3fs', $totaltime);
$debug_info[] = $db->sql_num_queries() . ' Queries';
@ -5122,10 +5118,10 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
return;
}
phpbb_check_and_display_sql_report();
phpbb_check_and_display_sql_report($request, $auth, $db);
$template->assign_vars(array(
'DEBUG_OUTPUT' => phpbb_generate_debug_output(),
'DEBUG_OUTPUT' => phpbb_generate_debug_output($db, $config, $auth, $user),
'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'),

4
phpBB/includes/functions_acp.php
View file

@ -146,10 +146,10 @@ function adm_page_footer($copyright_html = true)
return;
}
phpbb_check_and_display_sql_report();
phpbb_check_and_display_sql_report($request, $auth, $db);
$template->assign_vars(array(
'DEBUG_OUTPUT' => phpbb_generate_debug_output(),
'DEBUG_OUTPUT' => phpbb_generate_debug_output($db, $config, $auth, $user),
'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>&reg; Forum Software &copy; phpBB Limited'),