makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small change to r9839

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9847 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2009-07-25 10:16:13 +00:00
parent 4fcd83fa7d
commit b902fc20ae
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/template.php
View file

@ -39,8 +39,8 @@ class template
var $files_inherit = array(); var $files_inherit = array();
var $files_template = array(); var $files_template = array();
var $inherit_root = ''; var $inherit_root = '';
var $orig_tpl_storedb = 'undefined'; var $orig_tpl_storedb;
var $orig_tpl_inherits_id = 'undefined'; var $orig_tpl_inherits_id;
// this will hash handle names to the compiled/uncompiled code for that handle. // this will hash handle names to the compiled/uncompiled code for that handle.
var $compiled_code = array(); var $compiled_code = array();
@ -57,14 +57,17 @@ class template
{ {
$this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/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']) . '_'; $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']; $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']; $this->orig_tpl_inherits_id = $user->theme['template_inherits_id'];
} }
$user->theme['template_storedb'] = $this->orig_tpl_storedb; $user->theme['template_storedb'] = $this->orig_tpl_storedb;
$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id; $user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;