[mxbb-commits] core/includes mx_functions_style.php, 1.17.2.21, 1.17.2.22

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

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

Modified Files:
      Tag: core28x
	mx_functions_style.php 
Log Message:
Could not open ./modules/mx_music/templates/subSilver/subSilver.cfg style config file or file can not be validated. 
Current style: nt2007 
Cloned style: subSilver 
Default style: _core 
Custom module default style: _core 
Custom module config file: Not set

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.17.2.21
retrieving revision 1.17.2.22
diff -C2 -d -r1.17.2.21 -r1.17.2.22
*** mx_functions_style.php	9 Mar 2008 09:50:51 -0000	1.17.2.21
--- mx_functions_style.php	9 Mar 2008 11:35:05 -0000	1.17.2.22
***************
*** 775,778 ****
--- 775,789 ----
  		
  		//
+ 		// If use default module template intead
+ 		//
+ 		if ( !$mx_template_config )
+ 		{
+ 			$current_template_path = $module_root_path . $this->default_module_style;
+ 			$template_name = $this->default_module_style;
+ 
+ 			@include($mx_root_path . $module_root_path . $this->default_module_style . '/' . $this->default_module_style . '.cfg');
+ 		}		
+ 		
+ 		//
  		// If use default template with difrent modules config file name
  		//
***************
*** 781,787 ****
  			$current_template_path = $module_root_path . $this->default_current_template_path;
  			$template_name = $this->default_template_name;
! 
  			@include($module_root_path . $this->default_current_template_path . '/' . $this->module_cfg_name[$module_root_path] . '.cfg');
  		}
  
  		//
--- 792,803 ----
  			$current_template_path = $module_root_path . $this->default_current_template_path;
  			$template_name = $this->default_template_name;
! 			$module_cfg_info = "<br />Custom module config file: " . $this->module_cfg_name[$module_root_path];
! 			
  			@include($module_root_path . $this->default_current_template_path . '/' . $this->module_cfg_name[$module_root_path] . '.cfg');
  		}
+ 		else
+ 		{
+ 			$module_cfg_info = "<br />Custom module config file: Not set";
+ 		}
  
  		//
***************
*** 790,794 ****
  		if ( !$mx_template_config )
  		{
! 			mx_message_die(CRITICAL_ERROR, "Could not open mxBB " . $module_root_path . $this->default_current_template_path . " style config file", '', __LINE__, __FILE__);
  		}
  
--- 806,810 ----
  		if ( !$mx_template_config )
  		{
! 			mx_message_die(CRITICAL_ERROR, "Could not open " . $mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $this->cloned_template_name . '.cfg' . " style config file or file can not be validated. <br /> Current style: $this->template_name <br />Cloned style: $this->cloned_template_name <br />Default style: $this->default_template_name <br />Custom module default style: $this->default_module_style $module_cfg_info", '', __LINE__, __FILE__);
  		}