diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-02-21 01:31:10 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-02-21 01:31:10 +0000 |
| commit | 6b99b85c8f2f366d8e5e3e2855d77b0832d141d7 (patch) | |
| tree | b4a1a527cbc87866777d400618794078f5db90ba /phpBB/includes/bbcode.php | |
| parent | a4727a0f816f67d2fb4a7f7dcf18aedf5278bc62 (diff) | |
| download | forums-6b99b85c8f2f366d8e5e3e2855d77b0832d141d7.tar forums-6b99b85c8f2f366d8e5e3e2855d77b0832d141d7.tar.gz forums-6b99b85c8f2f366d8e5e3e2855d77b0832d141d7.tar.bz2 forums-6b99b85c8f2f366d8e5e3e2855d77b0832d141d7.tar.xz forums-6b99b85c8f2f366d8e5e3e2855d77b0832d141d7.zip | |
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
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f58852c00b..e41053d936 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -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)) |