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

[OryNider <ory...@us...>]

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

Modified Files:
      Tag: core28x
	mx_functions_core.php 
Log Message:
$mx_user->default_template_name -> $moduleDefault

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.52.2.11
retrieving revision 1.52.2.12
diff -C2 -d -r1.52.2.11 -r1.52.2.12
*** mx_functions_core.php	23 Mar 2008 01:51:34 -0000	1.52.2.11
--- mx_functions_core.php	23 Mar 2008 02:02:44 -0000	1.52.2.12
***************
*** 2939,2942 ****
--- 2939,2944 ----
  
  		$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;
  
  		if ( file_exists($mx_block->module_root_path . 'templates/' . $style_path.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']) ))
***************
*** 2950,2954 ****
  		else
  		{
! 			$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/'.$mx_user->default_template_name.'/'.(!empty($filename) ? $filename : $mx_user->default_template_name);
  		}
  	}
--- 2952,2956 ----
  		else
  		{
! 			$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/'. $moduleDefault .'/' . (!empty($filename) ? $filename : $moduleDefault);
  		}
  	}