diff options
| author | Jakub Senko <jakubsenko@gmail.com> | 2014-09-23 23:03:07 +0200 |
|---|---|---|
| committer | Jakub Senko <jakubsenko@gmail.com> | 2014-09-23 23:03:07 +0200 |
| commit | ca7f4fb5311849794957ac989e0c3090efebb66d (patch) | |
| tree | bfb9e9122f1cce86e1386880c0492a5d20a03d04 /phpBB/includes | |
| parent | 8bd1853b56b78ecbf6b06dea623284514589d339 (diff) | |
| download | forums-ca7f4fb5311849794957ac989e0c3090efebb66d.tar forums-ca7f4fb5311849794957ac989e0c3090efebb66d.tar.gz forums-ca7f4fb5311849794957ac989e0c3090efebb66d.tar.bz2 forums-ca7f4fb5311849794957ac989e0c3090efebb66d.tar.xz forums-ca7f4fb5311849794957ac989e0c3090efebb66d.zip | |
[ticket/10985] Add fix to properly inherit style during update process
PHPBB3-10985
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/bbcode.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f587e111f3..3c25fd6587 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -135,6 +135,11 @@ class bbcode $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; + if (empty($user->theme['template_inherits_id']) && !empty($template->orig_tpl_inherits_id)) + { + $user->theme['template_inherits_id'] = $template->orig_tpl_inherits_id; + } + if (!@file_exists($this->template_filename)) { if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) |