diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2011-09-20 18:46:45 +0100 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2011-09-20 21:06:52 +0100 |
| commit | ad11565ace0ef60bd98b2e368aeeffa67b6b1f49 (patch) | |
| tree | d188f0480322327d1e01f4ed45d71a3ee73c055d /phpBB | |
| parent | 23415170cb8e8c923c540bca84345bfb8f9e92c3 (diff) | |
| download | forums-ad11565ace0ef60bd98b2e368aeeffa67b6b1f49.tar forums-ad11565ace0ef60bd98b2e368aeeffa67b6b1f49.tar.gz forums-ad11565ace0ef60bd98b2e368aeeffa67b6b1f49.tar.bz2 forums-ad11565ace0ef60bd98b2e368aeeffa67b6b1f49.tar.xz forums-ad11565ace0ef60bd98b2e368aeeffa67b6b1f49.zip | |
[feature/remove-db-styles] Missed a few template DB bits in acp_styles.
PHPBB3-9741
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 26 |
1 files 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( |