[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.33,1.34

[Jonathan H. <the...@us...>]

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

Modified Files:
	bbcode.php 
Log Message:
Fix for bug #529642... Tabs should end parsing for magic urls as well as spaces or newlines...


Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** bbcode.php	18 Mar 2002 13:35:22 -0000	1.33
--- bbcode.php	18 Mar 2002 17:21:28 -0000	1.34
***************
*** 601,605 ****
  	// xxxx can only be alpha characters.
  	// yyyy is anything up to the first space, newline, or comma.
! 	$ret = preg_replace("#([\n ])([a-z]+?)://([^, \n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
  
  	// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
--- 601,605 ----
  	// xxxx can only be alpha characters.
  	// yyyy is anything up to the first space, newline, or comma.
! 	$ret = preg_replace("#([\n ])([a-z]+?)://([^,\t \n\r]+)#i", "\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", $ret);
  
  	// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
***************
*** 609,613 ****
  	// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
  	// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
! 	$ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^, \n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
  
  	// matches an email@domain type address at the start of a line, or after a space.
--- 609,613 ----
  	// This is slightly restrictive - it's not going to match stuff like "forums.foo.com"
  	// This is to keep it from getting annoying and matching stuff that's not meant to be a link.
! 	$ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^,\t \n\r]*)?)#i", "\\1<a href=\"http://www.\\2.\\3\\4\" target=\"_blank\">www.\\2.\\3\\4</a>", $ret);
  
  	// matches an email@domain type address at the start of a line, or after a space.
***************
*** 783,785 ****
  }
  
! ?>
\ No newline at end of file
--- 783,785 ----
  }
  
! ?>