--- core/string_api.php.orig	2005-02-07 12:23:52.725125000 -0800
+++ core/string_api.php	2005-02-07 12:22:54.287625000 -0800
@@ -292,7 +292,7 @@
 			return $p_string;
 		}
 		# Find any URL in a string and replace it by a clickable link		
-		$p_string = preg_replace( '/([http|irc|ftp|https]{2,}:\/\/([a-z0-9_-]|\/|\@|:{0,1}\.{0,1}){1,})/',
+		$p_string = preg_replace( '/([http|irc|ftp|https]{2,}:\/\/([a-zA-Z0-9_-]|\/|\@|[?=&]|:{0,1}\.{0,1}){1,})/',
 									'<a href="\1">\1</a> [<a href="\1" target="blank">^</a>]',   
 									$p_string);
 
@@ -304,7 +304,7 @@
 		#  when applied to data that has already had entities inserted.
 		#
 		# bpfennig: '@' doesn't accepted anymore
-		$t_atom = '[^\'@\'](?:[^()<>@,;:\\\".\[\]\000-\037\177 &]+)';
+		$t_atom = '[^\'@\'](?:[^()<>@,;:\/\\\".\[\]\000-\037\177 &]+)';
 
 		# In order to avoid selecting URLs containing @ characters as email
 		#  addresses we limit our selection to addresses that are preceded by: