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

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2012-07-06 06:18:56 -0700 (Fri, 06 Jul 2012)
New Revision: 8439

Modified:
   trunk/mapbender/http/classes/class_wmc.php
Log:
changes from 2.7 concerning WMS 1.3

Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2012-07-06 13:17:49 UTC (rev 8438)
+++ trunk/mapbender/http/classes/class_wmc.php	2012-07-06 13:18:56 UTC (rev 8439)
@@ -1841,7 +1841,11 @@
 			$wms->gui_wms_mapformat = $currentLayer["format"][$formatIndex]["name"];
 
 			$wms->gui_wms_featureinfoformat = "text/html"; // TODO : Add correct data
-			$wms->gui_wms_exceptionformat = "application/vnd.ogc.se_xml"; // TODO : Add correct data
+			if($currentLayer["version"] == '1.3.0' || $currentLayer["version"] == '1.0.0'){
+				$wms->gui_wms_exceptionformat = "XML"; // TODO : Add correct data
+			}else{
+				$wms->gui_wms_exceptionformat = "application/vnd.ogc.se_xml"; // TODO : Add correct data
+			}
 			$wms->gui_wms_epsg = $this->mainMap->getEpsg();
 			$wms->gui_wms_visible = $currentLayer["extension"]["WMS_VISIBLE"];
 			$wms->gui_wms_opacity = $currentLayer["extension"]["GUI_WMS_OPACITY"];