[Mapbender-commits] r2989 - branches/nimix_dev/http/extensions

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-09-19 04:10:22 -0400 (Fri, 19 Sep 2008)
New Revision: 2989

Modified:
   branches/nimix_dev/http/extensions/ext_featureInfoTunnel.php
Log:
translate encoding

Modified: branches/nimix_dev/http/extensions/ext_featureInfoTunnel.php
===================================================================
--- branches/nimix_dev/http/extensions/ext_featureInfoTunnel.php	2008-09-19 07:54:48 UTC (rev 2988)
+++ branches/nimix_dev/http/extensions/ext_featureInfoTunnel.php	2008-09-19 08:10:22 UTC (rev 2989)
@@ -39,7 +39,7 @@
 
 function toUTF8($str){
 	//check if we have an encoding meta tag
-	if(preg_match('/<meta.*charset=([^"\s]*).*>/',$str, $charset)){
+	if(preg_match('/<meta[^>]*charset=[\'"]*([^"\'\s>]*)[^>]*>/i',$str, $charset)){
 		//if so convert encoding to UTF-8
 		$ret = mb_convert_encoding($str, "UTF-8", $charset[1]);