diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-06 13:40:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-06 13:40:01 +0000 |
| commit | 51d173ff1e6d3764be4701b92ecfd68007ad1c81 (patch) | |
| tree | bf744132e028c3ee692ea8239fcb340f4a533adb /phpBB/includes/template.php | |
| parent | 8243e9a3728feca2356add9684f91451bf28a43f (diff) | |
| download | forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar.gz forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar.bz2 forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.tar.xz forums-51d173ff1e6d3764be4701b92ecfd68007ad1c81.zip | |
(a little test for later merges)
reintegrate branch into trunk (r10214)
git-svn-id: file:///svn/phpbb/trunk@10215 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/template.php')
| -rw-r--r-- | phpBB/includes/template.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 648af61c00..7d09694e2a 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -248,8 +248,13 @@ class template { global $user, $phpEx, $config; + if (!isset($this->filename[$handle])) + { + trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR); + } + $filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx; - $this->files_template[$handle] = $user->theme['template_id']; + $this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0; $recompile = false; if (!file_exists($filename) || @filesize($filename) === 0) |