[Fusionforge-commits] r13472 - branches/Branch_5_1/src/common/include trunk/src/common/include

Thorsten Glaser mirabilos at fusionforge.org
Fri Jun 10 11:55:25 CEST 2011


Author: mirabilos
Date: 2011-06-10 11:55:25 +0200 (Fri, 10 Jun 2011)
New Revision: 13472

Modified:
   branches/Branch_5_1/src/common/include/utils.php
   trunk/src/common/include/utils.php
Log:
a comma is valid in an URI

Modified: branches/Branch_5_1/src/common/include/utils.php
===================================================================
--- branches/Branch_5_1/src/common/include/utils.php	2011-06-10 09:50:52 UTC (rev 13471)
+++ branches/Branch_5_1/src/common/include/utils.php	2011-06-10 09:55:25 UTC (rev 13472)
@@ -5,7 +5,8 @@
  * Copyright 1999-2001, VA Linux Systems, Inc.
  * Copyright 2009-2010, Roland Mas
  * Copyright 2009-2010, Franck Villaume - Capgemini
- * Copyright 2010, Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright (c) 2010, 2011
+ *	Thorsten Glaser <t.glaser at tarent.de>
  * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -1428,7 +1429,7 @@
 	    $unencoded_string));
 	/* replace all URIs with ^AURI^A */
 	$s = preg_replace(
-	    '|([a-zA-Z][a-zA-Z0-9+.-]*:[#0-9a-zA-Z;/?:@&=+$._!~*\'()%-]+)|',
+	    '|([a-zA-Z][a-zA-Z0-9+.-]*:[#0-9a-zA-Z;/?:@&=+$,_.!~*\'()%-]+)|',
 	    "\x01\$1\x01", $s);
 	if (!$s)
 		return htmlentities($unencoded_string, ENT_QUOTES, "UTF-8");

Modified: trunk/src/common/include/utils.php
===================================================================
--- trunk/src/common/include/utils.php	2011-06-10 09:50:52 UTC (rev 13471)
+++ trunk/src/common/include/utils.php	2011-06-10 09:55:25 UTC (rev 13472)
@@ -5,7 +5,8 @@
  * Copyright 1999-2001, VA Linux Systems, Inc.
  * Copyright 2009-2011, Roland Mas
  * Copyright 2009-2011, Franck Villaume - Capgemini
- * Copyright 2010, Thorsten Glaser <t.glaser at tarent.de>
+ * Copyright (c) 2010, 2011
+ *	Thorsten Glaser <t.glaser at tarent.de>
  * Copyright 2010-2011, Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -1505,7 +1506,7 @@
 	    $unencoded_string));
 	/* replace all URIs with ^AURI^A */
 	$s = preg_replace(
-	    '|([a-zA-Z][a-zA-Z0-9+.-]*:[#0-9a-zA-Z;/?:@&=+$._!~*\'()%-]+)|',
+	    '|([a-zA-Z][a-zA-Z0-9+.-]*:[#0-9a-zA-Z;/?:@&=+$,_.!~*\'()%-]+)|',
 	    "\x01\$1\x01", $s);
 	if (!$s)
 		return htmlentities($unencoded_string, ENT_QUOTES, "UTF-8");




More information about the Fusionforge-commits mailing list