[mxbb-commits] mx_phpbb/includes forum_hack.php,1.43,1.44

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

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

Modified Files:
	forum_hack.php 
Log Message:
Bugfix, for subcall includes.

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** forum_hack.php	20 Feb 2008 21:07:27 -0000	1.43
--- forum_hack.php	21 Feb 2008 19:57:49 -0000	1.44
***************
*** 52,62 ****
  }
  
- // This is a temp fix, since this include should work regardless. I guess our subcall regex cannot handle non-standard in function includes.
- // Nevermind, this file is small and only loaded from usercp_register.php and functions_post.php.
- if(!function_exists('validate_username'))
- {
- 	include_once($phpbb_root_path . 'includes/functions_validate.' . $phpEx);
- }
- 
  /*
  // Cannot be loaded here, since its functions load other includes
--- 52,55 ----
***************
*** 1762,1772 ****
  		// Remove some includes already included by mxBB
  		//
! 		$code = preg_replace ("/include(.*)functions/", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_select/", "//", $code);
! 		//$code = preg_replace ("/include(.*)functions_search/", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_validate/", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_post/", "//", $code);
! 		$code = preg_replace ("/include(.*)bbcode/", "//", $code);
! 		$code = preg_replace ("/include(.*)auth/", "//", $code);
  
  		//
--- 1755,1763 ----
  		// Remove some includes already included by mxBB
  		//
! 		$code = preg_replace ("/include(.*)functions\./", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_select\./", "//", $code);
! 		$code = preg_replace ("/include(.*)functions_post\./", "//", $code);
! 		$code = preg_replace ("/include(.*)bbcode\./", "//", $code);
! 		$code = preg_replace ("/include(.*)auth\./", "//", $code);
  
  		//