[Mapbender-commits] r9601 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-09-22 02:56:15 -0700 (Thu, 22 Sep 2016)
New Revision: 9601

Modified:
   trunk/mapbender/http/classes/class_owsConstraints.php
Log:
Bugfix for wrong exchange of eregi_replace with preg_replace

Modified: trunk/mapbender/http/classes/class_owsConstraints.php
===================================================================
--- trunk/mapbender/http/classes/class_owsConstraints.php	2016-09-22 08:45:48 UTC (rev 9600)
+++ trunk/mapbender/http/classes/class_owsConstraints.php	2016-09-22 09:56:15 UTC (rev 9601)
@@ -105,14 +105,13 @@
 		return $returnObject;
 	}
 	
-	//function to parse urls as links
 	function display_text($string) {
-    		$string = preg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", "<a href=\"\\0\" target=_blank>\\0</a>", $string);   
-    		$string = preg_replace("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z](-?[0-9a-z])*\.)+[a-z]{2}([zmuvtg]|fo|me)?$", "<a href=\"mailto:\\0\" target=_blank>\\0</a>", $string);   
-    		$string = preg_replace("\n", "<br>", $string);
+    		$string = preg_replace("#[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]#", "<a href=\"\\0\" target=_blank>\\0</a>", $string);   
+    		$string = preg_replace("#^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z](-?[0-9a-z])*\.)+[a-z]{2}([zmuvtg]|fo|me)?$#", "<a href=\"mailto:\\0\" target=_blank>\\0</a>", $string);   
+    		$string = preg_replace("#\n#", "<br>", $string);
     		return $string;
 	}  
-	
+
 	function getDisclaimer() {
 		$htmlHeader = array();
 		//define header texts