[mxbb-commits] core/includes mx_functions_style.php,1.65,1.66

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
fix

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** mx_functions_style.php	11 Mar 2008 21:05:36 -0000	1.65
--- mx_functions_style.php	13 Mar 2008 20:50:56 -0000	1.66
***************
*** 247,251 ****
  		}
  
- 
  		//
  		// phpBB.........................................................................phpBB
--- 247,250 ----
***************
*** 258,262 ****
  			case 'internal':
  			case 'phpbb2':
- 
  				$fileSearch = array();
  				$fileSearch[] = $style_path; // First check current template
--- 257,260 ----
***************
*** 276,280 ****
  			//
  			case 'phpbb3':
- 
  				$fileSearch = array();
  				$fileSearch[] = $style_path . '/' . 'theme'; // First check current template
--- 274,277 ----
***************
*** 323,341 ****
  	function doFileSearch($fileSearch, $filename, $filename2, $root, $module_root_path = '', $check_file2 = true)
  	{
  		foreach ($fileSearch as $key => $path)
  		{
  			if (!empty($path))
  			{
! 				if( file_exists($module_root_path . $root . $path . '/' . $filename) )
  				{
! 					$this->module_template_path = $root . $path . '/';
! 					return $module_root_path . $root . $path . '/' . $filename;
  				}
  				if ($check_file2)
  				{
! 					if( file_exists($module_root_path . $root . $path . '/' . $filename2) )
  					{
! 						$this->module_template_path = $root . $path . '/';
! 						return $module_root_path . $root . $path . '/' . $filename2;
  					}
  				}
--- 320,341 ----
  	function doFileSearch($fileSearch, $filename, $filename2, $root, $module_root_path = '', $check_file2 = true)
  	{
+ 		global $mx_root_path;
+ 
+ 		$this->module_template_path = '';
  		foreach ($fileSearch as $key => $path)
  		{
  			if (!empty($path))
  			{
! 				if( file_exists($mx_root_path . $module_root_path . $root . $path . '/' . $filename) )
  				{
! 					$this->module_template_path = $mx_root_path . $root . $path . '/';
! 					return $mx_root_path . $module_root_path . $root . $path . '/' . $filename;
  				}
  				if ($check_file2)
  				{
! 					if( file_exists($mx_root_path . $module_root_path . $root . $path . '/' . $filename2) )
  					{
! 						$this->module_template_path = $mx_root_path . $root . $path . '/';
! 						return $mx_root_path . $module_root_path . $root . $path . '/' . $filename2;
  					}
  				}
***************
*** 343,357 ****
  			else if ($path == './')
  			{
! 				if( file_exists($module_root_path . $root . $filename) )
  				{
! 					$this->module_template_path = $root;
! 					return $module_root_path . $root . $filename;
  				}
  				if ($check_file2)
  				{
! 					if( file_exists($module_root_path . $root . $filename2) )
  					{
! 						$this->module_template_path = $root;
! 						return $module_root_path . $root . $filename2;
  					}
  				}
--- 343,357 ----
  			else if ($path == './')
  			{
! 				if( file_exists($mx_root_path . $module_root_path . $root . $filename) )
  				{
! 					$this->module_template_path = $mx_root_path . $root;
! 					return $mx_root_path . $module_root_path . $root . $filename;
  				}
  				if ($check_file2)
  				{
! 					if( file_exists($mx_root_path . $module_root_path . $root . $filename2) )
  					{
! 						$this->module_template_path = $mx_root_path . $root;
! 						return $mx_root_path . $module_root_path . $root . $filename2;
  					}
  				}