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

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
Update to custom module default style

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** mx_functions_style.php	17 Feb 2008 12:56:17 -0000	1.49
--- mx_functions_style.php	17 Feb 2008 16:45:01 -0000	1.50
***************
*** 1572,1575 ****
--- 1572,1591 ----
  	 * @param unknown_type $image_mode
  	 */
+ 	/**
+ 	 * Extend.
+ 	 *
+ 	 * Extend User Style with module lang and images.
+ 	 *
+ 	 * Usage:
+ 	 * - $mx_user->extend(LANG, IMAGES)
+ 	 *
+ 	 * Switches:
+ 	 * - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL
+ 	 * - IMAGES: MX_IMAGES (default), MX_NO_IMAGES
+ 	 *
+ 	 * @access public
+ 	 * @param unknown_type $lang_mode
+ 	 * @param unknown_type $image_mode
+ 	 */
  	function extend($lang_mode = MX_LANG_MAIN, $image_mode = MX_IMAGES)
  	{
***************
*** 1586,1609 ****
  		if ($image_mode != MX_IMAGES_NONE)
  		{
- 			//
- 			// 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;
- 			}
- 
  			$this->_load_module_style();
  
! 			//
! 			// Reset custom module default style, once used.
! 			//
! 			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 = '';
! 			}
  		}
  	}
--- 1602,1633 ----
  		if ($image_mode != MX_IMAGES_NONE)
  		{
  			$this->_load_module_style();
+ 		}
  
! 		//
! 		// Reset custom module default style, once used.
! 		//
! 		if (!empty($this->default_module_style))
! 		{
! 			$this->default_template_name = 'subSilver';
! 			$this->default_current_template_path = 'templates/' . $this->default_template_name;
! 			$this->default_module_style = '';
! 		}
! 	}
! 
! 	function set_module_default_style($default_module_style = '')
! 	{
! 		global $mx_block;
! 
! 		if (!empty($default_module_style))
! 		{
! 			$this->default_module_style = $default_module_style;
! 			$this->default_template_name = $this->default_module_style;
! 			$this->default_current_template_path = 'templates/' . $this->default_template_name;
! 		}
! 
! 		if (!defined('IN_ADMIN'))
! 		{
! 			$this->loaded_default_styles[$mx_block->module_root_path] = $this->default_module_style;
  		}
  	}