From a029793462775202bf41002fbcce90c2f69b17d9 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 9 Feb 2005 16:49:47 +0000 Subject: [PATCH] fixed bug [ 1106069 ] bad hypertext link creation when '&' is in the URL --- phpgwapi/inc/class.html.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php index 580663de89..773b016e0c 100644 --- a/phpgwapi/inc/class.html.inc.php +++ b/phpgwapi/inc/class.html.inc.php @@ -110,7 +110,7 @@ class html // First match things beginning with http:// (or other protocols) $Protocol = '(http|ftp|https):\/\/'; $Domain = '([\w]+.[\w]+)'; - $Subdir = '([\w\-\.,@?^=%&:\/~\+#]*[\w\-\@?^=%&\/~\+#])?'; + $Subdir = '([\w\-\.,@?^=%&;:\/~\+#]*[\w\-\@?^=%&\/~\+#])?'; $Expr = '/' . $NotAnchor . $Protocol . $Domain . $Subdir . '/i'; $result = preg_replace( $Expr, "$2$3", $result );