[mxbb-commits] core/includes mx_functions_style.php, 1.17.2.16, 1.17.2.17

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

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

Modified Files:
      Tag: core28x
	mx_functions_style.php 
Log Message:
Bugfix, for custom module styles

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.17.2.16
retrieving revision 1.17.2.17
diff -C2 -d -r1.17.2.16 -r1.17.2.17
*** mx_functions_style.php	17 Feb 2008 16:45:31 -0000	1.17.2.16
--- mx_functions_style.php	17 Feb 2008 22:11:17 -0000	1.17.2.17
***************
*** 64,68 ****
  	function make_filename($filename)
  	{
! 		global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user;
  
  		$style_path = $theme['template_name'] . '/';
--- 64,68 ----
  	function make_filename($filename)
  	{
! 		global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block;
  
  		$style_path = $theme['template_name'] . '/';
***************
*** 74,78 ****
  		{
  			$this->module_template_path = '';
! 			$moduleDefault = !empty($mx_user->loaded_default_styles[$module_root_path]) ? $mx_user->loaded_default_styles[$module_root_path] : $mx_user->default_template_name;
  
  			if( file_exists($module_root_path . 'templates/' . $style_path . '/' . $filename) )
--- 74,78 ----
  		{
  			$this->module_template_path = '';
! 			$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($module_root_path . 'templates/' . $style_path . '/' . $filename) )
***************
*** 186,190 ****
  			if( !file_exists($filename) )
  			{
! 				die("Template->make_filename(): Error - file $filename does not exist.");
  			}
  		}
--- 186,190 ----
  			if( !file_exists($filename) )
  			{
! 				die(var_export($mx_user->loaded_default_styles) . "Template->make_filename(): Error - file $filename does not exist. <br />Module: $module_root_path <br />Current style: $style_path <br />Cloned style: $mx_user->cloned_template_name <br />Default style: $mx_user->default_template_name <br />Custom module default style: $moduleDefault");
  			}
  		}