[mxbb-commits] core/includes mx_functions_core.php,1.10,1.11 page_header.php,1.24,1.25

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4364/includes

Modified Files:
	mx_functions_core.php page_header.php 
Log Message:
support for phpbb template cache

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** page_header.php	1 Oct 2005 14:10:45 -0000	1.24
--- page_header.php	2 Oct 2005 21:24:30 -0000	1.25
***************
*** 75,79 ****
  	// Initialize template
  	//
! 	$layouttemplate = new mx_Template( $template->root, $board_config, $db );
  }
  
--- 75,80 ----
  	// Initialize template
  	//
! 	//$layouttemplate = new mx_Template( $template->root, $board_config, $db );
! 	$layouttemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db );
  }
  

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_functions_core.php	1 Oct 2005 14:10:45 -0000	1.10
--- mx_functions_core.php	2 Oct 2005 21:24:30 -0000	1.11
***************
*** 1170,1179 ****
  	function load_block_panels( $block_id = false )
  	{
! 		global $template, $blockcptemplate, $board_config;
  		
  		$return = false;
  		
! 		ob_start();				
! 		$template = new mx_Template($template->root, $board_config);
  		$this->_get_custom_module_panels($parameter_data, $block_id);
  		$block_panels = ob_get_contents();
--- 1170,1180 ----
  	function load_block_panels( $block_id = false )
  	{
! 		global $mx_root_path, $template, $blockcptemplate, $board_config, $theme;
  		
  		$return = false;
  		
! 		ob_start();			
! 		//$template = new mx_Template($template->root, $board_config);	
! 		$template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name'], $board_config);
  		$this->_get_custom_module_panels($parameter_data, $block_id);
  		$block_panels = ob_get_contents();
***************
*** 1195,1199 ****
  	function load_block_parameters( $block_id = false )
  	{
! 		global $template, $blockcptemplate, $board_config;
  		
  		$return = false;
--- 1196,1200 ----
  	function load_block_parameters( $block_id = false )
  	{
! 		global $mx_root_path, $template, $blockcptemplate, $board_config, $theme;
  		
  		$return = false;
***************
*** 1204,1208 ****
  			{
  				$this->is_panel = false;
! 				$template = new mx_Template($template->root, $board_config);
  				
  				switch ( $parameter_data['parameter_type'] )
--- 1205,1210 ----
  			{
  				$this->is_panel = false;
! 				//$template = new mx_Template($template->root, $board_config);
! 				$template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name'] , $board_config);
  				
  				switch ( $parameter_data['parameter_type'] )