[mxbb-commits] core/includes mx_functions_core.php,1.48,1.49

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

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

Modified Files:
	mx_functions_core.php 
Log Message:
Styling bug, the custom overall_header.tpl files didn't work

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** mx_functions_core.php	9 Jul 2007 21:57:05 -0000	1.48
--- mx_functions_core.php	12 Jul 2007 22:42:26 -0000	1.49
***************
*** 2547,2553 ****
  		$this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? 1 : 0 ) : ( $this->info['override_user_style'] == 1 ? 1 : 0 );
  
! 		$this->page_ov_header = !empty($this->info['page_header']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header'];
! 		$this->page_ov_footer = !empty($this->info['page_footer']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_footer']) ? $this->info['page_footer'] : $portal_config['overall_footer'];
! 		$this->page_main_layout = !empty($this->info['page_main_layout']) && file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $this->info['page_main_layout']) ? $this->info['page_main_layout'] : $portal_config['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'];
--- 2547,2553 ----
  		$this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? 1 : 0 ) : ( $this->info['override_user_style'] == 1 ? 1 : 0 );
  
! 		$this->page_ov_header = !empty($this->info['page_header']) ? $this->info['page_header'] : $portal_config['overall_header'];
! 		$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'];
  		$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'];