diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-04 15:49:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-04 15:49:22 +0000 |
| commit | e11da225e02ae4aa353fe27d774186ae9e513648 (patch) | |
| tree | 2667ecb281b12adf3584d9913d11b693aba6ece8 /phpBB/adm/index.php | |
| parent | b131931edbb9243509450302ddac27e7e310ab29 (diff) | |
| download | forums-e11da225e02ae4aa353fe27d774186ae9e513648.tar forums-e11da225e02ae4aa353fe27d774186ae9e513648.tar.gz forums-e11da225e02ae4aa353fe27d774186ae9e513648.tar.bz2 forums-e11da225e02ae4aa353fe27d774186ae9e513648.tar.xz forums-e11da225e02ae4aa353fe27d774186ae9e513648.zip | |
- slightly adjusted the DEBUG/DEBUG_EXTRA requirements
- changed error_reporting to E_ALL
- our error handler now takes the error_reporting value into account allowing us to correctly supress notices
git-svn-id: file:///svn/phpbb/trunk@5877 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/index.php')
| -rw-r--r-- | phpBB/adm/index.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 5a36a9e03e..40f46dc5b8 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -149,12 +149,12 @@ function adm_page_footer($copyright_html = true) $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && method_exists($db, 'sql_report')) + if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) { $db->sql_report('display'); } - $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off' ) . ' | Load : ' . (($user->load) ? $user->load : 'N/A'), $totaltime); + $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) { |