From ca7f4fb5311849794957ac989e0c3090efebb66d Mon Sep 17 00:00:00 2001
From: Jakub Senko <jakubsenko@gmail.com>
Date: Tue, 23 Sep 2014 23:03:07 +0200
Subject: [ticket/10985] Add fix to properly inherit style during update
process
PHPBB3-10985
---
phpBB/includes/bbcode.php | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'phpBB/includes/bbcode.php')
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'])
--
cgit v1.2.1