aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-12-04 20:25:51 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-12-04 20:25:51 +0000
commit2fd418fc2141aa3d5a38b47fc129f8cbb2e9d770 (patch)
tree7b61bae7e2978cc861a61a151c4b9f8266cd33dd /phpBB/includes/functions_module.php
parentd6785155ad46c8cadac331a140b229b99cb3562a (diff)
downloadforums-2fd418fc2141aa3d5a38b47fc129f8cbb2e9d770.tar
forums-2fd418fc2141aa3d5a38b47fc129f8cbb2e9d770.tar.gz
forums-2fd418fc2141aa3d5a38b47fc129f8cbb2e9d770.tar.bz2
forums-2fd418fc2141aa3d5a38b47fc129f8cbb2e9d770.tar.xz
forums-2fd418fc2141aa3d5a38b47fc129f8cbb2e9d770.zip
- some bugfixes
- checking if page_header has been called already - call correct page footer function - rewrote avatar gallery - seperated compilation of template and template functions (new file: functions_template.php) - added assign_display function to template - added group management (acp) - removed admin_groups git-svn-id: file:///svn/phpbb/trunk@5319 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php20
1 files changed, 17 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index ba43943406..5c5f7e30e2 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -382,16 +382,30 @@ class p_master
*/
function display($page_title)
{
- global $template;
+ global $template, $user;
// Generate the page
- page_header($page_title);
+ if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin'])
+ {
+ adm_page_header($page_title);
+ }
+ else
+ {
+ page_header($page_title);
+ }
$template->set_filenames(array(
'body' => $this->get_tpl_name())
);
- page_footer();
+ if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin'])
+ {
+ adm_page_footer();
+ }
+ else
+ {
+ page_footer();
+ }
}
/**