[mxbb-commits] core/includes/shared/phpbb3/includes functions.php, 1.13, 1.14 functions_hook.php, 1.11, 1.12 message_parser.php, 1.2, 1.3

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

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

Modified Files:
	functions.php functions_hook.php message_parser.php 
Log Message:
Updated load_file() method. Bugfix. The wrong file was included.

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** functions.php	12 Feb 2008 10:54:05 -0000	1.13
--- functions.php	22 Feb 2008 23:03:55 -0000	1.14
***************
*** 10,14 ****
  
  /**
!  * @ignore 
   */
  if (!defined('IN_PORTAL'))
--- 10,14 ----
  
  /**
!  * @ignore
   */
  if (!defined('IN_PORTAL'))
***************
*** 827,831 ****
  	return ( sizeof( $error ) ) ? $error : false;
  }
! 	
  }
  // Compatibility functions
--- 827,831 ----
  	return ( sizeof( $error ) ) ? $error : false;
  }
! 
  }
  // Compatibility functions
***************
*** 3003,3008 ****
  		{
  			global $phpbb_root_path, $phpEx;
! 			mx_page::load_file( 'bbcode', 'phpbb3');
! 			//include($phpbb_root_path . 'includes/bbcode.' . $phpEx);
  		}
  
--- 3003,3007 ----
  		{
  			global $phpbb_root_path, $phpEx;
! 			mx_page::load_file( 'bbcode');
  		}
  

Index: message_parser.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/message_parser.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** message_parser.php	12 Feb 2008 10:54:05 -0000	1.2
--- message_parser.php	22 Feb 2008 23:03:55 -0000	1.3
***************
*** 10,14 ****
  
  /**
!  * @ignore 
   */
  if (!defined('IN_PORTAL'))
--- 10,14 ----
  
  /**
!  * @ignore
   */
  if (!defined('IN_PORTAL'))
***************
*** 19,23 ****
  if (!class_exists('bbcode'))
  {
! 	mx_page::load_file( 'bbcode', 'phpbb3');
  }
  
--- 19,23 ----
  if (!class_exists('bbcode'))
  {
! 	mx_page::load_file( 'bbcode');
  }
  

Index: functions_hook.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** functions_hook.php	12 Feb 2008 10:54:05 -0000	1.11
--- functions_hook.php	22 Feb 2008 23:03:55 -0000	1.12
***************
*** 10,14 ****
  
  /**
!  * @ignore 
   */
  if (!defined('IN_PORTAL'))
--- 10,14 ----
  
  /**
!  * @ignore
   */
  if (!defined('IN_PORTAL'))
***************
*** 17,23 ****
  }
  
! mx_page::load_file( 'functions', 'phpbb3');
! mx_page::load_file( 'functions_module', 'phpbb3');
! mx_page::load_file( 'message_parser', 'phpbb3');
  
  class mx_phpbb3_admin
--- 17,23 ----
  }
  
! mx_page::load_file( 'functions');
! mx_page::load_file( 'functions_module');
! mx_page::load_file( 'message_parser');
  
  class mx_phpbb3_admin
***************
*** 32,36 ****
  	var $p_master = null;
  	var $mx_master = null;
! 	
  	/**
  	 * Constructor
--- 32,36 ----
  	var $p_master = null;
  	var $mx_master = null;
! 
  	/**
  	 * Constructor
***************
*** 168,172 ****
  		$func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match );
  
! 		mx_page::load_file( 'utf/utf_tools', 'phpbb3');
  		for( $i = 0; $i < $func_cnt; $i++ )
  		{
--- 168,172 ----
  		$func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match );
  
! 		mx_page::load_file( 'utf/utf_tools');
  		for( $i = 0; $i < $func_cnt; $i++ )
  		{
***************
*** 266,270 ****
  			die();
  		}
! 		
  		return preg_replace( array_keys( $preg_array), $preg_array, $html);
  	}
--- 266,270 ----
  			die();
  		}
! 
  		return preg_replace( array_keys( $preg_array), $preg_array, $html);
  	}