aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-07-13 15:15:05 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-07-13 15:15:05 +0000
commit8633c91692e5bb160d51bfc5e3a5057e1605b874 (patch)
tree4c72b336c87986832efe3a1e0a05e28cf21bff21 /phpBB/includes/functions.php
parent91a695268344d4bb250c440498aeb9df69c6b515 (diff)
downloadforums-8633c91692e5bb160d51bfc5e3a5057e1605b874.tar
forums-8633c91692e5bb160d51bfc5e3a5057e1605b874.tar.gz
forums-8633c91692e5bb160d51bfc5e3a5057e1605b874.tar.bz2
forums-8633c91692e5bb160d51bfc5e3a5057e1605b874.tar.xz
forums-8633c91692e5bb160d51bfc5e3a5057e1605b874.zip
Cope with secondary (per forum) styles, probably other minor things too ... there is a known permissions problem, will work on that soon. Ashe, the bbcode primary/secondary stuff may need some tightening, particularly since it only checks the bbcode_bitfield for the primary template (which may not exist as coped with later) ... I'll leave that to you to alter.
git-svn-id: file:///svn/phpbb/trunk@4236 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php32
1 files changed, 16 insertions, 16 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 092b5b592a..6e3a60c0b5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1321,20 +1321,20 @@ function page_header($page_title = '')
'L_INDEX' => $user->lang['FORUM_INDEX'],
'L_ONLINE_EXPLAIN' => $l_online_time,
- 'U_PRIVATEMSGS' => 'ucp.'.$phpEx.$SID.'&amp;mode=pm&amp;folder=inbox',
- 'U_MEMBERLIST' => 'memberlist.'.$phpEx.$SID,
- 'U_VIEWONLINE' => 'viewonline.'.$phpEx.$SID,
- 'U_MEMBERSLIST' => 'memberlist.'.$phpEx.$SID,
- 'U_GROUP_CP' => 'groupcp.'.$phpEx.$SID,
- 'U_LOGIN_LOGOUT'=> $u_login_logout,
- 'U_INDEX' => 'index.'.$phpEx.$SID,
- 'U_SEARCH' => 'search.'.$phpEx.$SID,
- 'U_REGISTER' => 'ucp.'.$phpEx.$SID.'&amp;mode=register',
- 'U_PROFILE' => 'ucp.'.$phpEx.$SID,
- 'U_MODCP' => 'mcp.'.$phpEx.$SID,
- 'U_FAQ' => 'faq.'.$phpEx.$SID,
- 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&amp;search_id=egosearch',
- 'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&amp;search_id=newposts',
+ 'U_PRIVATEMSGS' => 'ucp.'.$phpEx.$SID.'&amp;mode=pm&amp;folder=inbox',
+ 'U_MEMBERLIST' => 'memberlist.'.$phpEx.$SID,
+ 'U_VIEWONLINE' => 'viewonline.'.$phpEx.$SID,
+ 'U_MEMBERSLIST' => 'memberlist.'.$phpEx.$SID,
+ 'U_GROUP_CP' => 'groupcp.'.$phpEx.$SID,
+ 'U_LOGIN_LOGOUT' => $u_login_logout,
+ 'U_INDEX' => 'index.'.$phpEx.$SID,
+ 'U_SEARCH' => 'search.'.$phpEx.$SID,
+ 'U_REGISTER' => 'ucp.'.$phpEx.$SID.'&amp;mode=register',
+ 'U_PROFILE' => 'ucp.'.$phpEx.$SID,
+ 'U_MODCP' => 'mcp.'.$phpEx.$SID,
+ 'U_FAQ' => 'faq.'.$phpEx.$SID,
+ 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&amp;search_id=egosearch',
+ 'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&amp;search_id=newposts',
'U_SEARCH_UNANSWERED' => 'search.'.$phpEx.$SID.'&amp;search_id=unanswered',
'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false,
@@ -1350,8 +1350,8 @@ function page_header($page_title = '')
'S_DISPLAY_PM' => (empty($config['privmsg_disable'])) ? 1 : 0,
'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0,
- 'T_STYLESHEET_DATA' => $user->theme['css_data'],
- 'T_STYLESHEET_LINK' => 'templates/' . $user->theme['css_external'])
+ 'T_THEME_PATH' => 'styles/themes/' . $user->theme['primary']['theme_name'],
+ 'T_STYLESHEET_LINK' => 'styles/themes/' . $user->theme['primary']['css_external'])
);
if (!empty($config['send_encoding']))