diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-01-19 22:27:14 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-01-19 22:27:14 +0100 |
| commit | ebbe6a77918717c9d0897698223c1b783159d67e (patch) | |
| tree | 367df1b2ebb201b9a744525d82523496ffd1bfdc /phpBB/includes | |
| parent | b54dbe0df6003264df7cbc64c15714e403dd1aa5 (diff) | |
| parent | ca7f4fb5311849794957ac989e0c3090efebb66d (diff) | |
| download | forums-ebbe6a77918717c9d0897698223c1b783159d67e.tar forums-ebbe6a77918717c9d0897698223c1b783159d67e.tar.gz forums-ebbe6a77918717c9d0897698223c1b783159d67e.tar.bz2 forums-ebbe6a77918717c9d0897698223c1b783159d67e.tar.xz forums-ebbe6a77918717c9d0897698223c1b783159d67e.zip | |
Merge pull request #2990 from Senky/ticket/10985
[ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
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']) |