diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-09-16 08:11:52 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-09-16 08:11:52 +0000 |
| commit | 697fd5a134bde47006f57b6dd8df4e2dec6a7f3d (patch) | |
| tree | 31ce382faa83f35cc974f584a8ac22d64305a1fe /phpBB/includes/bbcode.php | |
| parent | b27e96cf62399013646439ff352ebbc558e1e2c6 (diff) | |
| download | forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar.gz forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar.bz2 forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.tar.xz forums-697fd5a134bde47006f57b6dd8df4e2dec6a7f3d.zip | |
Fix #51285 and more issues with template inherence on set_custom_template
Conflict introduced with r9839 and r9823
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10150 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 693523dcbb..f58852c00b 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -128,7 +128,7 @@ class bbcode */ function bbcode_cache_init() { - global $user, $phpbb_root_path; + global $phpbb_root_path, $template, $user; if (empty($this->template_filename)) { @@ -137,7 +137,7 @@ class bbcode if (!@file_exists($this->template_filename)) { - if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) + if (isset($template->orig_tpl_inherits_id) && $template->orig_tpl_inherits_id) { $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template/bbcode.html'; if (!@file_exists($this->template_filename)) |