[mxbb-commits] core/includes mx_functions_core.php, 1.52.2.12, 1.52.2.13

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

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

Modified Files:
      Tag: core28x
	mx_functions_core.php 
Log Message:
Bugfix, missing cache key.

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.52.2.12
retrieving revision 1.52.2.13
diff -C2 -d -r1.52.2.12 -r1.52.2.13
*** mx_functions_core.php	23 Mar 2008 02:02:44 -0000	1.52.2.12
--- mx_functions_core.php	29 Apr 2008 18:27:48 -0000	1.52.2.13
***************
*** 372,375 ****
--- 372,376 ----
  						pag.page_header,
  						pag.page_footer,
+ 						pag.page_main_layout,
  						pag.navigation_block,
  						pag.auth_view AS pag_auth_view,
***************
*** 421,424 ****
--- 422,426 ----
  				"page_header" => $row['page_header'],
  				"page_footer" => $row['page_footer'],
+ 				"page_main_layout" => $row['page_main_layout'],
  				"page_navigation_block" => $row['navigation_block'],
  				"page_auth_view" => $row['pag_auth_view'],
***************
*** 2732,2735 ****
--- 2734,2738 ----
  		$this->page_ov_footer = !empty($this->info['page_footer']) ? $this->info['page_footer'] : $portal_config['overall_footer'];
  		$this->page_main_layout = !empty($this->info['page_main_layout']) ? $this->info['page_main_layout'] : $portal_config['main_layout'];
+ 		//echo($this->page_main_layout);
  		$this->phpbb_stats = $this->info['phpbb_stats'] == -1 ? ($portal_config['top_phpbb_links'] == 1 ? true : false ) : ( $this->info['phpbb_stats'] == 1 ? true : false );
  		$this->page_navigation_block = $this->info['page_navigation_block'] == 0 ? $portal_config['navigation_block'] : $this->info['page_navigation_block'];
***************
*** 2939,2943 ****
  
  		$style_path = $theme['template_name'];
! 		
  		$moduleDefault = !empty($mx_user->loaded_default_styles[$mx_block->module_root_path]) ? $mx_user->loaded_default_styles[$mx_block->module_root_path] : $mx_user->default_template_name;
  
--- 2942,2946 ----
  
  		$style_path = $theme['template_name'];
! 
  		$moduleDefault = !empty($mx_user->loaded_default_styles[$mx_block->module_root_path]) ? $mx_user->loaded_default_styles[$mx_block->module_root_path] : $mx_user->default_template_name;