mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
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
This commit is contained in:
@@ -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');
|
||||
}
|
||||
|
Reference in New Issue
Block a user