diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:45:02 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-10 10:45:02 -0600 |
| commit | bd37f7f6c04780819dfa8f81b2d761b91859fd67 (patch) | |
| tree | a4dc4bd1c1d7ba2e21e35ef57dee353defc7da9f /phpBB/includes/functions.php | |
| parent | 7085a6c74d9bc5a4c5a92033977a89f56cce01e1 (diff) | |
| download | forums-bd37f7f6c04780819dfa8f81b2d761b91859fd67.tar forums-bd37f7f6c04780819dfa8f81b2d761b91859fd67.tar.gz forums-bd37f7f6c04780819dfa8f81b2d761b91859fd67.tar.bz2 forums-bd37f7f6c04780819dfa8f81b2d761b91859fd67.tar.xz forums-bd37f7f6c04780819dfa8f81b2d761b91859fd67.zip | |
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
PHPBB3-11189
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 7801c48aa7..804d89d1a2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4191,7 +4191,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) $log_text .= '<br /><br />BACKTRACE<br />' . $backtrace; } - if (defined('IN_INSTALL') || defined('DEBUG_EXTRA') || isset($auth) && $auth->acl_get('a_')) + if (defined('IN_INSTALL') || defined('DEBUG') || isset($auth) && $auth->acl_get('a_')) { $msg_text = $log_text; } @@ -5241,14 +5241,14 @@ function page_footer($run_cron = true) $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && 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'); } $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress'] && @extension_loaded('zlib')) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); - if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) + if ($auth->acl_get('a_') && defined('DEBUG')) { if (function_exists('memory_get_peak_usage')) { |