Index: includes/bbcode.php
===================================================================
--- includes/bbcode.php	(Revision 10142)
+++ includes/bbcode.php	(Arbeitskopie)
@@ -128,7 +128,7 @@
 	*/
 	function bbcode_cache_init()
 	{
-		global $user, $phpbb_root_path;
+		global $phpbb_root_path, $template, $user;
 
 		if (empty($this->template_filename))
 		{
@@ -137,7 +137,7 @@
 
 			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']) || (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))