[mxbb-commits] core/includes template.php,1.34,1.35

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23206

Modified Files:
	template.php 
Log Message:
minor stuff

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/template.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** template.php	1 Sep 2008 02:14:18 -0000	1.34
--- template.php	1 Nov 2008 18:13:32 -0000	1.35
***************
*** 817,822 ****
  
  		foreach($filename_array as $handle => $filename)
! 		{		
! 		
  			$this->set_filename($handle, $filename);
  		}
--- 817,821 ----
  
  		foreach($filename_array as $handle => $filename)
! 		{
  			$this->set_filename($handle, $filename);
  		}
***************
*** 831,835 ****
  	function set_filename($handle, $filename, $xs_include = false, $quiet = false)
  	{
! 		global $board_config, $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block;
  		$can_cache = $this->use_cache;
  		if(strpos($filename, '..') !== false)
--- 830,834 ----
  	function set_filename($handle, $filename, $xs_include = false, $quiet = false)
  	{
! 		global $board_config;
  		$can_cache = $this->use_cache;
  		if(strpos($filename, '..') !== false)
***************
*** 857,861 ****
  			}
  		}
! 		
  		// creating cache filename
  		if($can_cache != '')
--- 856,860 ----
  			}
  		}
! 
  		// creating cache filename
  		if($can_cache != '')
***************
*** 940,944 ****
  		{
  			echo '<!-- template ', $this->files[$handle], ' start -->';
! 		}			
  
  		if ($filename)
--- 939,943 ----
  		{
  			echo '<!-- template ', $this->files[$handle], ' start -->';
! 		}
  
  		if ($filename)
***************
*** 994,999 ****
  		}
  		$this->xs_startup();
! 		$force_recompile = empty($this->uncompiled_code[$handle]) ? false : true;		
! 		
  		// checking if php file exists.
  		if (!empty($this->files_cache[$handle]) && !$force_recompile)
--- 993,998 ----
  		}
  		$this->xs_startup();
! 		$force_recompile = empty($this->uncompiled_code[$handle]) ? false : true;
! 
  		// checking if php file exists.
  		if (!empty($this->files_cache[$handle]) && !$force_recompile)
***************
*** 1019,1024 ****
  				$this->compiled_code[$handle] = $this->compile2($this->uncompiled_code[$handle], '', '');
  			}
! 		}	
! 		
  		// Run the compiled code.
  		if (empty($this->files_cache[$handle]) || $force_recompile)
--- 1018,1023 ----
  				$this->compiled_code[$handle] = $this->compile2($this->uncompiled_code[$handle], '', '');
  			}
! 		}
! 
  		// Run the compiled code.
  		if (empty($this->files_cache[$handle]) || $force_recompile)
***************
*** 1030,1034 ****
  			$this->execute($this->files_cache[$handle], '', $handle);
  		}
! 		
  		return true;
  	}
--- 1029,1033 ----
  			$this->execute($this->files_cache[$handle], '', $handle);
  		}
! 
  		return true;
  	}
***************
*** 1078,1082 ****
  			}
  		}
! 		
  
  		//if ($filename = $this->_tpl_load($handle))
--- 1077,1081 ----
  			}
  		}
! 
  
  		//if ($filename = $this->_tpl_load($handle))