diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-07-30 13:56:13 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-07-30 13:56:13 +0000 |
| commit | b7fe9f7b8a336c5718686b39b8cdff40e300aff1 (patch) | |
| tree | d3d1bebf0943ed35be99a87d56eebff69a99e505 /phpBB/includes/acp/acp_styles.php | |
| parent | b6d3eff8c8ae6888364c287afc0d2fc1d2079017 (diff) | |
| download | forums-b7fe9f7b8a336c5718686b39b8cdff40e300aff1.tar forums-b7fe9f7b8a336c5718686b39b8cdff40e300aff1.tar.gz forums-b7fe9f7b8a336c5718686b39b8cdff40e300aff1.tar.bz2 forums-b7fe9f7b8a336c5718686b39b8cdff40e300aff1.tar.xz forums-b7fe9f7b8a336c5718686b39b8cdff40e300aff1.zip | |
cleaning tpl fallbacks up
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8733 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_styles.php')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 495a5a4786..8a062c7759 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1044,7 +1044,7 @@ inherit_from = {INHERIT_FROM} { if (!$template_row['template_storedb']) { - if (!file_exists($file)) + if (!file_exists($file_tpl)) { $file_tpl = "{$phpbb_root_path}styles/{$template_row['template_inherit_path']}/template/$tpl_file.html"; $inherited = true; @@ -2759,6 +2759,7 @@ inherit_from = {INHERIT_FROM} 'S_LOCATION' => (isset($installcfg['inherit_from']) && $installcfg['inherit_from']) ? false : true, 'S_STYLE' => ($mode == 'style') ? true : false, 'S_TEMPLATE' => ($mode == 'template') ? true : false, + 'S_SUPERTEMPLATE' => (isset($installcfg['inherit_from'])) ? $installcfg['inherit_from'] : '', 'S_THEME' => ($mode == 'theme') ? true : false, 'S_STORE_DB' => (isset($style_row[$mode . '_storedb'])) ? $style_row[$mode . '_storedb'] : 0, |