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

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
Minor update to custom module default style
*.cfg updated

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** mx_functions_style.php	16 Feb 2008 20:15:00 -0000	1.48
--- mx_functions_style.php	17 Feb 2008 12:56:17 -0000	1.49
***************
*** 488,495 ****
  	var $current_template_path = '';
  
! 	var $cloned_template_name = '' ;
  	var $cloned_current_template_path = '';
  
! 	var $default_template_name = '_core' ;
  	var $default_current_template_path = '';
  
--- 488,495 ----
  	var $current_template_path = '';
  
! 	var $cloned_template_name = '';
  	var $cloned_current_template_path = '';
  
! 	var $default_template_name = '_core';
  	var $default_current_template_path = '';
  
***************
*** 986,990 ****
  		@include($mx_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg');
  
! 		/*
  		if ( !$mx_template_config )
  		{
--- 986,990 ----
  		@include($mx_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg');
  
! 		/* Removed since in 2.9.x+ our default template is no style
  		if ( !$mx_template_config )
  		{
***************
*** 1187,1200 ****
  
  		//
- 		// Hack for modern modules, with non-subSilver default template
- 		//
- 		if (!empty($this->default_module_style) && $this->default_module_style != $this->default_template_name)
- 		{
- 			$this->default_current_template_path = 'templates/' . $this->default_module_style . '/';
- 			$this->default_template_name = $this->default_module_style;
- 			$this->default_module_style = '';
- 		}
- 
- 		//
  		// Load MX-Publisher Template configuration data
  		// - First try current template
--- 1187,1190 ----
***************
*** 1599,1606 ****
  			// Hack for modern modules, with non-subSilver default template
  			//
! 			if (!empty($this->default_module_style) && $this->default_module_style != $this->default_template_name)
  			{
- 				$this->default_current_template_path = 'templates/' . $this->default_module_style . '/';
  				$this->default_template_name = $this->default_module_style;
  			}
  
--- 1589,1596 ----
  			// Hack for modern modules, with non-subSilver default template
  			//
! 			if (!empty($this->default_module_style) )
  			{
  				$this->default_template_name = $this->default_module_style;
+ 				$this->default_current_template_path = 'templates/' . $this->default_template_name;
  			}
  
***************
*** 1612,1617 ****
  			if (!empty($this->default_module_style))
  			{
! 				$this->default_current_template_path = '';
! 				$this->default_template_name = 'subSilver';
  				$this->default_module_style = '';
  			}
--- 1602,1607 ----
  			if (!empty($this->default_module_style))
  			{
! 				$this->default_template_name = '_core';
! 				$this->default_current_template_path = 'templates/' . $this->default_template_name;
  				$this->default_module_style = '';
  			}