aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2009-07-25 10:16:13 +0000
committerChris Smith <toonarmy@phpbb.com>2009-07-25 10:16:13 +0000
commitb902fc20ae78438af7eb44e9b1f078cdcc213e16 (patch)
tree0e151705ec4b0a3c906bc379cdbfa34381c05585
parent4fcd83fa7d44e0e875697eecef2386f732052b58 (diff)
downloadforums-b902fc20ae78438af7eb44e9b1f078cdcc213e16.tar
forums-b902fc20ae78438af7eb44e9b1f078cdcc213e16.tar.gz
forums-b902fc20ae78438af7eb44e9b1f078cdcc213e16.tar.bz2
forums-b902fc20ae78438af7eb44e9b1f078cdcc213e16.tar.xz
forums-b902fc20ae78438af7eb44e9b1f078cdcc213e16.zip
Small change to r9839
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9847 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/template.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index fa7cf437fd..fece30e4cd 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -39,8 +39,8 @@ class template
var $files_inherit = array();
var $files_template = array();
var $inherit_root = '';
- var $orig_tpl_storedb = 'undefined';
- var $orig_tpl_inherits_id = 'undefined';
+ var $orig_tpl_storedb;
+ var $orig_tpl_inherits_id;
// this will hash handle names to the compiled/uncompiled code for that handle.
var $compiled_code = array();
@@ -57,14 +57,17 @@ class template
{
$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
$this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
- if ($this->orig_tpl_storedb == 'undefined')
+
+ if ($this->orig_tpl_storedb === null)
{
$this->orig_tpl_storedb = $user->theme['template_storedb'];
}
- if ($this->orig_tpl_inherits_id == 'undefined')
+
+ if ($this->orig_tpl_inherits_id === null)
{
$this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
}
+
$user->theme['template_storedb'] = $this->orig_tpl_storedb;
$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;