[mxbb-commits] core/includes mx_functions_core.php, 1.46, 1.47 mx_functions_style.php, 1.15, 1.16

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

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

Modified Files:
	mx_functions_core.php mx_functions_style.php 
Log Message:
Bugs 45. Solved issue with custom page styles.

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** mx_functions_core.php	19 Jun 2007 18:30:42 -0000	1.46
--- mx_functions_core.php	19 Jun 2007 19:42:25 -0000	1.47
***************
*** 2542,2546 ****
  
  		$this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] );
! 		$this->override_user_style = $this->info['override_user_style'] == -1 ? ($portal_config['override_user_style'] == 1 ? true : false ) : ( $this->info['override_user_style'] == 1 ? true : false );
  
  		$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'];
--- 2542,2546 ----
  
  		$this->default_style = $this->info['default_style'] == -1 ? ($portal_config['default_style']) : ( $this->info['default_style'] );
! 		$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'];

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_functions_style.php	10 Jun 2007 21:26:40 -0000	1.15
--- mx_functions_style.php	19 Jun 2007 19:42:25 -0000	1.16
***************
*** 406,410 ****
  		{
  			$init_style = $mx_page->default_style == -1 ? $portal_config['default_style'] : $mx_page->default_style;
! 			$init_override = $mx_page->override_user_style == -1 ? $portal_config['override_user_style'] : $mx_page->override_user_style;
  		}
  		else
--- 406,410 ----
  		{
  			$init_style = $mx_page->default_style == -1 ? $portal_config['default_style'] : $mx_page->default_style;
! 			$init_override = intval($mx_page->override_user_style) == -1 ? $portal_config['override_user_style'] : $mx_page->override_user_style;
  		}
  		else
***************
*** 430,434 ****
  		// Setup style
  		//
! 		if ( !$portal_config['override_user_style'] )
  		{
  			if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_style'] > 0 )
--- 430,434 ----
  		// Setup style
  		//
! 		if ( !$init_override )
  		{
  			if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_style'] > 0 )