From ad11565ace0ef60bd98b2e368aeeffa67b6b1f49 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Tue, 20 Sep 2011 18:46:45 +0100
Subject: [PATCH] [feature/remove-db-styles] Missed a few template DB bits in
 acp_styles.

PHPBB3-9741
---
 phpBB/includes/acp/acp_styles.php | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 7ab2061141..389bbee483 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -748,30 +748,10 @@ version = {VERSION}
 			$file_tpl = "{$phpbb_root_path}styles/{$template_row['template_path']}/template/$tpl_file.html";
 			$inherited = false;
 
-			if (isset($template_row['template_inherits_id']) && $template_row['template_inherits_id'])
+			if (isset($template_row['template_inherits_id']) && $template_row['template_inherits_id'] && !file_exists($file_tpl))
 			{
-				if (!$template_row['template_storedb'])
-				{
-					if (!file_exists($file_tpl))
-					{
-						$file_tpl = "{$phpbb_root_path}styles/{$template_row['template_inherit_path']}/template/$tpl_file.html";
-						$inherited = true;
-					}
-				}
-				else
-				{
-					if ($file_template_db[$file . '.html'] == $template_row['template_inherits_id'])
-					{
-						$file_tpl = "{$phpbb_root_path}styles/{$template_row['template_inherit_path']}/template/$tpl_file.html";
-						$inherited = true;
-					}
-				}
-			}
-
-			// Correct the filename if it is stored in database and the file is in a subfolder.
-			if ($template_row['template_storedb'])
-			{
-				$file = str_replace('.', '/', $file);
+				$file_tpl = "{$phpbb_root_path}styles/{$template_row['template_inherit_path']}/template/$tpl_file.html";
+				$inherited = true;
 			}
 
 			$template->assign_block_vars('file', array(