aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-12 22:16:27 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-12 22:16:27 +0000
commit298d3c0c50f14601472b832f3ecd8fcd8c07dfe4 (patch)
tree68b06c337a4b20fe2bfba66732085d66fe9c1e12 /phpBB/includes/functions.php
parent4a0ddb9dfbe76f0e074d85a417541591ec25daa6 (diff)
downloadforums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar.gz
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar.bz2
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.tar.xz
forums-298d3c0c50f14601472b832f3ecd8fcd8c07dfe4.zip
- get swatch converted into new acp format
- add page title to ucp pages - add ability to supress getting the who is online list in page_header() (saves us ideally 1-2 queries on ucp/mcp pages) - fixing pm rules a bit as well as now having complete author memberships for author_in_group (sender -> is in usergroup -> xxx) git-svn-id: file:///svn/phpbb/trunk@6054 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 479acc291e..d6cd9efd1f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2343,7 +2343,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
/**
* Generate page header
*/
-function page_header($page_title = '')
+function page_header($page_title = '', $display_online_list = true)
{
global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
@@ -2381,7 +2381,7 @@ function page_header($page_title = '')
// Get users online list ... if required
$l_online_users = $online_userlist = $l_online_record = '';
- if ($config['load_online'] && $config['load_online_time'])
+ if ($config['load_online'] && $config['load_online_time'] && $display_online_list)
{
$userlist_ary = $userlist_visible = array();
$logged_visible_online = $logged_hidden_online = $guests_online = $prev_user_id = 0;
@@ -2635,6 +2635,7 @@ function page_header($page_title = '')
'T_TEMPLATE_PATH' => "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template',
'T_IMAGESET_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset',
'T_IMAGESET_LANG_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->data['user_lang'],
+ 'T_IMAGES_PATH' => "{$phpbb_root_path}images/",
'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/",
'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/",
'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/",