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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: core28x
	mx_functions_core.php 
Log Message:
if I/We use add_css_file() in both 2.9 and 2.8 modules and they are merged we need all features of this function to be merged...

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.52.2.10
retrieving revision 1.52.2.11
diff -C2 -d -r1.52.2.10 -r1.52.2.11
*** mx_functions_core.php	23 Feb 2008 19:38:24 -0000	1.52.2.10
--- mx_functions_core.php	23 Mar 2008 01:51:34 -0000	1.52.2.11
***************
*** 2933,2948 ****
  	 * @param string $path
  	 */
! 	function add_css_file()
  	{
! 		global $mx_block, $theme;
  
! 		$style_path = $theme['template_name'] . '/';
! 		if ( file_exists($mx_block->module_root_path . 'templates/' . $style_path . $theme['head_stylesheet']) )
  		{
! 	 		$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/' . $style_path . $theme['head_stylesheet'];
  		}
  		else
  		{
! 			$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/subSilver/'  . $theme['head_stylesheet'];
  		}
  	}
--- 2933,2954 ----
  	 * @param string $path
  	 */
! 	function add_css_file($filename = '')
  	{
! 		global $mx_block, $theme, $mx_user;
  
! 
! 		$style_path = $theme['template_name'];
! 
! 		if ( file_exists($mx_block->module_root_path . 'templates/' . $style_path.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']) ))
  		{
! 	 		$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/' . $style_path.'/'.(!empty($filename) ? $filename : $theme['head_stylesheet']);
! 		}
! 		else if ( file_exists($mx_block->module_root_path . 'templates/' . $mx_user->cloned_template_name.'/'.(!empty($filename) ? $filename : $mx_user->cloned_template_name)) )
! 		{
! 	 		$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/' . $mx_user->cloned_template_name.'/'.(!empty($filename) ? $filename : $mx_user->cloned_template_name);
  		}
  		else
  		{
! 			$this->mxbb_css_addup[] = $mx_block->module_root_path . 'templates/'.$mx_user->default_template_name.'/'.(!empty($filename) ? $filename : $mx_user->default_template_name);
  		}
  	}