diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-12 23:27:19 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-06-12 23:27:19 +0200 |
| commit | 6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf (patch) | |
| tree | adb4d2d0bc9db51b698e3f5063a1a175b635e576 /phpBB/includes/functions.php | |
| parent | ceef85ee0e4e425b5f1a79a378506752d46cef02 (diff) | |
| download | forums-6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf.tar forums-6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf.tar.gz forums-6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf.tar.bz2 forums-6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf.tar.xz forums-6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf.zip | |
[ticket/12687] Remove globals
PHPBB3-12687
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 96c2c4132e..3634e9a01c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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>® Forum Software © phpBB Limited'), |