makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2990 from Senky/ticket/10985

Browse source 
[ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
This commit is contained in:
Nils Adermann 2015-01-19 22:27:14 +01:00
commit ebbe6a7791
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/bbcode.php
View file

@ -135,6 +135,11 @@ class bbcode
$this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']);
$this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; $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 (!@file_exists($this->template_filename))
{ {
if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])