diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-20 16:54:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-20 16:54:15 +0000 |
| commit | cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903 (patch) | |
| tree | b60c6980ad85e4a8daf48a10c3ab9e2efa4f29c2 /phpBB/adm | |
| parent | b55f9854e770ba7c37e0e1914c8570c856cbecf3 (diff) | |
| download | forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.gz forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.bz2 forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.xz forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.zip | |
i am not sure if people will like the config layout i test here... it requires the framework at least being present
git-svn-id: file:///svn/phpbb/trunk@9281 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/index.php | 11 | ||||
| -rw-r--r-- | phpBB/adm/swatch.php | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index a6a6dcb563..c66935d84a 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -171,26 +171,25 @@ function adm_page_footer($copyright_html = true) global $starttime; // Output page creation time - if (defined('DEBUG')) + if (phpbb::$base_config['debug']) { $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - if (phpbb_request::variable('explain', false) && phpbb::$acl->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists(phpbb::$db, 'sql_report')) + if (phpbb_request::variable('explain', false) && phpbb::$acl->acl_get('a_') && phpbb::$base_config['debug_extra'] && method_exists(phpbb::$db, 'sql_report')) { phpbb::$db->sql_report('display'); } $debug_output = sprintf('Time : %.3fs | ' . phpbb::$db->sql_num_queries() . ' Queries | GZIP : ' . ((phpbb::$config['gzip_compress']) ? 'On' : 'Off') . ((phpbb::$user->system['load']) ? ' | Load : ' . phpbb::$user->system['load'] : ''), $totaltime); - if (phpbb::$acl->acl_get('a_') && defined('DEBUG_EXTRA')) + if (phpbb::$acl->acl_get('a_') && phpbb::$base_config['debug_extra']) { if (function_exists('memory_get_usage')) { if ($memory_usage = memory_get_usage()) { - global $base_memory_usage; - $memory_usage -= $base_memory_usage; + $memory_usage -= phpbb::$base_config['memory_usage']; $memory_usage = get_formatted_filesize($memory_usage); $debug_output .= ' | Memory Usage: ' . $memory_usage; @@ -202,7 +201,7 @@ function adm_page_footer($copyright_html = true) } phpbb::$template->assign_vars(array( - 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', + 'DEBUG_OUTPUT' => (phpbb::$base_config['debug']) ? $debug_output : '', 'TRANSLATION_INFO' => (!empty(phpbb::$user->lang['TRANSLATION_INFO'])) ? phpbb::$user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'VERSION' => phpbb::$config['version']) diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 7ee6d7d0c0..a7ece7e30d 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -23,7 +23,7 @@ $auth->acl($user->data); $user->setup(); // Set custom template for admin area -$template->set_custom_template(PHPBB_ROOT_PATH . CONFIG_ADM_FOLDER . '/style', 'admin'); +$template->set_custom_template(PHPBB_ROOT_PATH . phpbb::$base_config['admin_folder'] . '/style', 'admin'); $template->set_filenames(array( 'body' => 'colour_swatch.html') |