[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.30,1.31

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv1007/includes

Modified Files:
	bbcode.php 
Log Message:
doh

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** bbcode.php	12 Feb 2002 17:53:20 -0000	1.30
--- bbcode.php	12 Feb 2002 17:55:52 -0000	1.31
***************
*** 210,214 ****
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-_.]+?@[\w\-]+\.[\w\-\.]+\.[\w]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
--- 210,214 ----
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
***************
*** 613,617 ****
  	// matches an email@domain type address at the start of a line, or after a space.
  	// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
! 	$ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.[\w\-\.]+\.[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
  
  	// Remove our padding..
--- 613,617 ----
  	// matches an email@domain type address at the start of a line, or after a space.
  	// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
! 	$ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)?[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
  
  	// Remove our padding..