[mxbb-commits] core/includes mx_functions_core.php, 1.81, 1.82 mx_functions_phpbb.php, 1.47, 1.48 mx_functions_tools.php, 1.22, 1.23

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

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

Modified Files:
	mx_functions_core.php mx_functions_phpbb.php 
	mx_functions_tools.php 
Log Message:
Updated load_file() method. Bugfix. The wrong file was included.

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** mx_functions_core.php	17 Feb 2008 20:14:26 -0000	1.81
--- mx_functions_core.php	22 Feb 2008 23:02:49 -0000	1.82
***************
*** 3318,3339 ****
  	 * Load additional functions/classes.
  	 *
! 	 * @access public
! 	 * @param string $text
! 	 * @param boolean $read_file
  	 */
! 	function load_file($file = '', $backend = '', $ext = '')
  	{
  		global $mx_root_path, $phpbb_root_path, $phpEx;
  
! 		$backend = !empty($backend) ? 'shared/' . $backend . '/includes/' : '';
! 		$ext = !empty($ext) ? $ext : $phpEx;
  
! 		if (file_exists($mx_root_path . 'includes/'.$backend.$file.'.'.$ext))
! 		{
! 			@include_once($mx_root_path . 'includes/'.$backend.$file.'.'.$ext);
! 		}
! 		else
  		{
! 			@include_once($phpbb_root_path . 'includes/'.$file.'.'.$ext);
  		}
  	}
--- 3318,3334 ----
  	 * Load additional functions/classes.
  	 *
! 	 * @param unknown_type $file
! 	 * @param unknown_type $backend
! 	 * @param unknown_type $force_shared
  	 */
! 	function load_file($file = '', $force_shared = false)
  	{
  		global $mx_root_path, $phpbb_root_path, $phpEx;
  
! 		$path = PORTAL_BACKEND == 'internal' || $force_shared ? $mx_root_path . 'includes/shared/' . PORTAL_BACKEND . '/includes/' : $phpbb_root_path . 'includes/';
  
! 		if (file_exists($path . $file.'.'.$phpEx))
  		{
! 			include_once($path . $file.'.'.$phpEx);
  		}
  	}

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** mx_functions_phpbb.php	17 Feb 2008 20:14:26 -0000	1.47
--- mx_functions_phpbb.php	22 Feb 2008 23:02:49 -0000	1.48
***************
*** 152,156 ****
  	if( !function_exists('generate_smilies') )
  	{
! 		mx_page::load_file('functions_post', 'phpbb2');
  	}
  
--- 152,156 ----
  	if( !function_exists('generate_smilies') )
  	{
! 		mx_page::load_file('functions_post');
  	}
  
***************
*** 247,251 ****
  	if( !function_exists('generate_smilies') )
  	{
! 		mx_page::load_file('functions_post', 'phpbb2');
  	}
  
--- 247,251 ----
  	if( !function_exists('generate_smilies') )
  	{
! 		mx_page::load_file('functions_post');
  	}
  
***************
*** 275,279 ****
  	if( !function_exists('bbencode_second_pass') )
  	{
! 		mx_page::load_file('bbcode', 'phpbb2');
  	}
  
--- 275,279 ----
  	if( !function_exists('bbencode_second_pass') )
  	{
! 		mx_page::load_file('bbcode');
  	}
  

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mx_functions_tools.php	18 Feb 2008 20:19:32 -0000	1.22
--- mx_functions_tools.php	22 Feb 2008 23:02:49 -0000	1.23
***************
*** 20,24 ****
  if( !function_exists('bbencode_second_pass') )
  {
! 	mx_page::load_file('bbcode', 'phpbb2');
  }
  
--- 20,24 ----
  if( !function_exists('bbencode_second_pass') )
  {
! 	mx_page::load_file('bbcode');
  }
  
***************
*** 1600,1604 ****
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post', 'phpbb2');
  }
  
--- 1600,1604 ----
  if( !function_exists('generate_smilies') )
  {
! 	mx_page::load_file('functions_post');
  }