svn commit: r461 - trunk/mapbender/http/classes/class_wms.php

[uli at osgeo.org]

Author: uli
Date: 2006-06-19 10:23:43+0000
New Revision: 461

Modified:
   trunk/mapbender/http/classes/class_wms.php

Log:
bug in encoding fixed

Modified: trunk/mapbender/http/classes/class_wms.php
Url: https://mapbender.osgeo.org/source/browse/mapbender/trunk/mapbender/http/classes/class_wms.php?view=diff&rev=461&p1=trunk/mapbender/http/classes/class_wms.php&p2=trunk/mapbender/http/classes/class_wms.php&r1=460&r2=461
==============================================================================
--- trunk/mapbender/http/classes/class_wms.php	(original)
+++ trunk/mapbender/http/classes/class_wms.php	2006-06-19 10:23:43+0000
@@ -54,13 +54,13 @@
 function createObjFromXML($url){
 
 	$x = new connector($url);
-	$data = $this->char_encode($x->file);
+	$data = $x->file;
 	if(!$data){
 		echo "Unable to open document: ".$url;
 		die; 
 	}
 	
-	$this->wms_getcapabilities_doc = $data;
+	$this->wms_getcapabilities_doc = $this->char_encode($data);
 	$this->wms_upload_url = $url;
 	if(!$data){
 		$this->wms_status = false;
@@ -455,7 +455,6 @@
 		$this->objLayer[$i]->gui_layer_minscale = $this->objLayer[$i]->layer_minscale;
 		$this->objLayer[$i]->gui_layer_maxscale = $this->objLayer[$i]->layer_maxscale;
 	}
-	
 	for($i=0;$i<count($this->data_format);$i++){
 		if(strtolower($this->data_type[$i]) == 'map' && strtoupper($this->data_format[$i]) == strtoupper($map_default)){
 			$this->gui_wms_mapformat = strtolower($map_default);
@@ -1237,7 +1236,7 @@
   }
   	function char_encode($s){
 		if(CHARSET == 'UTF-8'){
-			$s = utf8_encode($s);	
+			$s = utf8_encode($s);
 		}
 		return $s;
 	}