diff options
| -rw-r--r-- | phpBB/includes/bbcode.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 32 |
2 files changed, 21 insertions, 19 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 18b5e961a7..db0f330c36 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -276,16 +276,18 @@ class bbcode ); } - if ($bbcode_id != -1 && !($user->theme['bbcode_bitfield'] & (1 << $bbcode_id))) + if ($bbcode_id != -1 && !($user->theme['primary']['bbcode_bitfield'] & (1 << $bbcode_id))) { return $bbcode_hardtpl[$tpl_name]; } if (empty($this->bbcode_template)) { - $tpl_filename = $template->make_filename('bbcode.html'); + global $user; - if (!$fp = @fopen($tpl_filename, 'rb')) + $tpl_filename = (file_exists($phpbb_root_path . 'styles/templates/' . $user->theme['primary']['template_path'] . '/bbcode.html')) ? $phpbb_root_path . 'styles/templates/' . $user->theme['primary']['template_path'] . '/bbcode.html' : $phpbb_root_path . 'styles/templates/' . $user->theme['secondary']['template_path'] . '/bbcode.html'; + + if (!($fp = @fopen($tpl_filename, 'rb'))) { trigger_error('Could not load bbcode template'); } 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.'&mode=pm&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.'&mode=register', - 'U_PROFILE' => 'ucp.'.$phpEx.$SID, - 'U_MODCP' => 'mcp.'.$phpEx.$SID, - 'U_FAQ' => 'faq.'.$phpEx.$SID, - 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&search_id=egosearch', - 'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&search_id=newposts', + 'U_PRIVATEMSGS' => 'ucp.'.$phpEx.$SID.'&mode=pm&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.'&mode=register', + 'U_PROFILE' => 'ucp.'.$phpEx.$SID, + 'U_MODCP' => 'mcp.'.$phpEx.$SID, + 'U_FAQ' => 'faq.'.$phpEx.$SID, + 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&search_id=egosearch', + 'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&search_id=newposts', 'U_SEARCH_UNANSWERED' => 'search.'.$phpEx.$SID.'&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'])) |