1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

BBCode parser now uses the user object for all settings rather than taking some from the template object [Bug #57365]

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10515 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2010-02-21 01:31:10 +00:00
parent a4727a0f81
commit 6b99b85c8f
2 changed files with 2 additions and 1 deletions

View File

@@ -137,7 +137,7 @@ class bbcode
if (!@file_exists($this->template_filename))
{
if (isset($template->orig_tpl_inherits_id) && $template->orig_tpl_inherits_id)
if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
{
$this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template/bbcode.html';
if (!@file_exists($this->template_filename))