aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-12-19 17:59:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-12-19 17:59:15 +0000
commit5ac4556ef18b87a040515bc33b5863af0f2e4795 (patch)
tree90a1e105bbad824aedfeafe6a69781f86bfa8d89 /phpBB/includes/template.php
parent3c6c673476a90a22c0dc1c5f99b2c47b25a1be0e (diff)
downloadforums-5ac4556ef18b87a040515bc33b5863af0f2e4795.tar
forums-5ac4556ef18b87a040515bc33b5863af0f2e4795.tar.gz
forums-5ac4556ef18b87a040515bc33b5863af0f2e4795.tar.bz2
forums-5ac4556ef18b87a040515bc33b5863af0f2e4795.tar.xz
forums-5ac4556ef18b87a040515bc33b5863af0f2e4795.zip
- some fixes/changes
git-svn-id: file:///svn/phpbb/trunk@5035 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/template.php')
-rw-r--r--phpBB/includes/template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index a95423f4a9..317bf8c5b6 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -157,7 +157,7 @@ class template
trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
}
- if (!file_exists($this->files[$handle]))
+ if (!file_exists($this->files[$handle]) && !empty($user->theme['secondary']))
{
$this->tpl = 'secondary';
$this->files[$handle] = $phpbb_root_path . 'styles/' . $user->theme['secondary']['template_path'] . '/template/' . $this->filename[$handle];