[mxbb-commits] core/includes/shared/phpbb3/includes functions.php, 1.11, 1.12

[Culprit <cul...@us...>]

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

Modified Files:
	functions.php 
Log Message:
functions fix for phpBB3 backend

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** functions.php	8 Feb 2008 15:55:23 -0000	1.11
--- functions.php	12 Feb 2008 06:33:18 -0000	1.12
***************
*** 2949,2953 ****
  	$message = str_replace($match, $replace, $message);
  
! 	$match = get_preg_expression('bbcode_htm');
  	$replace = array('\1', '\1', '\2', '\1', '', '');
  
--- 2949,2953 ----
  	$message = str_replace($match, $replace, $message);
  
! 	$match = phpBB3::get_preg_expression('bbcode_htm');
  	$replace = array('\1', '\1', '\2', '\1', '', '');
  
***************
*** 2967,2971 ****
  	$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?$uid)\]#", ' ', $text);
  
! 	$match = get_preg_expression('bbcode_htm');
  	$replace = array('\1', '\1', '\2', '\1', '', '');
  
--- 2967,2971 ----
  	$text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?$uid)\]#", ' ', $text);
  
! 	$match = phpBB3::get_preg_expression('bbcode_htm');
  	$replace = array('\1', '\1', '\2', '\1', '', '');
  
***************
*** 3066,3070 ****
  	global $phpbb_root_path, $phpEx;
  
! 	decode_message($text, $uid);
  
  	return array(
--- 3066,3070 ----
  	global $phpbb_root_path, $phpEx;
  
! 	phpBB3::decode_message($text, $uid);
  
  	return array(
***************
*** 3213,3229 ****
  
  		// relative urls for this board
! 		$magic_url_match[] = '#(^|[\n\t (>])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')";
  
  		// matches a xxxx://aaaaa.bbb.cccc. ...
! 		$magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('url_inline') . ')#ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')";
  
  		// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
! 		$magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')";
  
  		// matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
! 		$magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')";
  	}
--- 3213,3229 ----
  
  		// relative urls for this board
! 		$magic_url_match[] = '#(^|[\n\t (>])(' . preg_quote($server_url, '#') . ')/(' . phpBB3::get_preg_expression('relative_url_inline') . ')#ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')";
  
  		// matches a xxxx://aaaaa.bbb.cccc. ...
! 		$magic_url_match[] = '#(^|[\n\t (>])(' . phpBB3::get_preg_expression('url_inline') . ')#ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')";
  
  		// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
! 		$magic_url_match[] = '#(^|[\n\t (>])(' . phpBB3::get_preg_expression('www_url_inline') . ')#ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')";
  
  		// matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
! 		$magic_url_match[] = '/(^|[\n\t (>])(' . phpBB3::get_preg_expression('email') . ')/ie';
  		$magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')";
  	}