[mxbb-commits] core/includes mx_functions_style.php,1.12,1.13

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
Styles fix
Last message block update - "memory" of current page

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mx_functions_style.php	4 Jun 2007 21:14:02 -0000	1.12
--- mx_functions_style.php	5 Jun 2007 21:20:19 -0000	1.13
***************
*** 363,373 ****
  		if ( defined('IN_ADMIN') )
  		{
! 			$init_style = $portal_config['default_admin_style']; // Use subSilver (if installed)
  			$init_override = 1;
  		}
  		else if (isset($mx_page))
  		{
! 			$init_style = $mx_page->default_style;
! 			$init_override = $mx_page->override_user_style;
  		}
  		else
--- 363,373 ----
  		if ( defined('IN_ADMIN') )
  		{
! 			$init_style = $portal_config['default_admin_style'];
  			$init_override = 1;
  		}
  		else if (isset($mx_page))
  		{
! 			$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