[Phpbb-checkins] r9847 - /branches/phpBB-3_0_0/phpBB/includes/template.php

[Chris S. <too...@ph...>]

Author: toonarmy
Date: Sat Jul 25 11:16:13 2009
New Revision: 9847

Log:
Small change to r9839

Modified:
    branches/phpBB-3_0_0/phpBB/includes/template.php

Modified: branches/phpBB-3_0_0/phpBB/includes/template.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/template.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/template.php Sat Jul 25 11:16:13 2009
***************
*** 39,46 ****
  	var $files_inherit = array();
  	var $files_template = array();
  	var $inherit_root = '';
! 	var $orig_tpl_storedb = 'undefined';
! 	var $orig_tpl_inherits_id = 'undefined';
  
  	// this will hash handle names to the compiled/uncompiled code for that handle.
  	var $compiled_code = array();
--- 39,46 ----
  	var $files_inherit = array();
  	var $files_template = array();
  	var $inherit_root = '';
! 	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,70 ****
  		{
  			$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')
  			{
  				$this->orig_tpl_storedb = $user->theme['template_storedb'];
  			}
! 			if ($this->orig_tpl_inherits_id == 'undefined')
  			{
  				$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;
  
--- 57,73 ----
  		{
  			$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 === null)
  			{
  				$this->orig_tpl_storedb = $user->theme['template_storedb'];
  			}
! 
! 			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;