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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-07-20 09:39:07 -0400 (Fri, 20 Jul 2007)
New Revision: 1522

Modified:
   trunk/mapbender/http/classes/class_administration.php
Log:
added a case in char_encode

if (CHARSET == iso && someString == UTF8) {
	return utf8_decode(someString)
	
}

Modified: trunk/mapbender/http/classes/class_administration.php
===================================================================
--- trunk/mapbender/http/classes/class_administration.php	2007-07-20 12:59:45 UTC (rev 1521)
+++ trunk/mapbender/http/classes/class_administration.php	2007-07-20 13:39:07 UTC (rev 1522)
@@ -936,10 +936,14 @@
 	
 	function char_encode($data) {
 		if (CHARSET == "UTF-8") {
+			if (!$this->is_utf8($data)) {
+				return utf8_encode($data);
+			}
+		}
+		else {
 			if ($this->is_utf8($data)) {
-				return $data;
+				return utf8_decode($data);
 			}
-			return utf8_encode($data);
 		}
 		return $data;
 	}
@@ -949,7 +953,6 @@
 			if ($this->is_utf8($data)) {
 				return utf8_decode($data);
 			}
-			return $data;
 		}
 		return $data;
 	}