diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-11 04:42:06 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-11 04:42:06 -0600 |
| commit | 84ba10ec8c023ab307eb7d0b829ab337aaaae78e (patch) | |
| tree | 468abf9fbb513cba53803ca29c6b65fd4ea497ec /phpBB/includes/functions.php | |
| parent | 106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 (diff) | |
| parent | e86ecc0f3bd6383d31a670896720a970b8faaaa9 (diff) | |
| download | forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.gz forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.bz2 forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.xz forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.zip | |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 39642acf6d..4e26d2c642 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4239,12 +4239,12 @@ 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; } - if ((defined('DEBUG') || defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db)) + if ((defined('IN_CRON') || defined('IMAGE_OUTPUT')) && isset($db)) { // let's avoid loops $db->sql_return_on_error(true); @@ -5308,14 +5308,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')) { |