[Mapbender-commits] r8510 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2012-11-26 02:16:52 -0800 (Mon, 26 Nov 2012)
New Revision: 8510

Modified:
   trunk/mapbender/http/php/mod_wmc2ol.php
Log:
Bugfix for handling of mimetype image/jpeg in newer ol (2.11+)

Modified: trunk/mapbender/http/php/mod_wmc2ol.php
===================================================================
--- trunk/mapbender/http/php/mod_wmc2ol.php	2012-11-22 07:23:03 UTC (rev 8509)
+++ trunk/mapbender/http/php/mod_wmc2ol.php	2012-11-26 10:16:52 UTC (rev 8510)
@@ -217,7 +217,7 @@
 	//initialize markers
 	$html.="var markers = new OpenLayers.Layer.Markers(\"Markers\", {'calculateInRange': function() { return true; }});\n";
 	//initialize logo
-	$html.="var logo = \"<a href = 'http://www.mapbender.org' target='_blank'><img src='../img/Mapbender_logo_and_text.png' height='20' width='120' alt='Mapbender Logo'/></a><br><a href = 'mod_getWmcDisclaimer.php?&id=".$wmcId."&languageCode=de&hostName=".$hostName."' target='_blank'>"._mb('Terms of use')."</a>\";\n";
+	$html.="var logo = \"<a href = 'http://www.geoportal.rlp.de' target='_blank'><img src='../img/logo_geoportal_neu.png' height='20' width='120' alt='Mapbender Logo'/></a><br><a href = 'mod_getWmcDisclaimer.php?&id=".$wmcId."&languageCode=de&hostName=".$hostName."' target='_blank'>"._mb('Terms of use')."</a>\";\n";
 	//$html.="var logo = \"<a href = 'http://www.geoportal.rlp.de' target='_blank'><img src='../img/logo_geoportal_neu.png' height='20' width='120' alt='Geoportal Logo'/></a><br><a href = 'mod_getWmcDisclaimer.php?&id=".$wmcId."&languageCode=de&hostName=".$hostName."' target='_blank'>"._mb('Terms of use')."</a>\";\n";
 	//check for some queryable layer in web map context document
 	$someLayerQueryable=false;
@@ -379,7 +379,6 @@
 					$format=$current_format;
 				}
 			}
-			//$format=str_replace('image/jpeg','jpeg',$format);
 			$html.="		format: \"".$format."\",\n";
 			$html.="		transparent: \"On\"\n";
 			$html.="		},\n";
@@ -438,8 +437,6 @@
 					$format=$current_format;
 				}
 			}
-			$format=str_replace('image/jpeg','jpeg',$format);
-#			$format=str_replace('image/','',$format);
 			$html.="		format: \"".$format."\",\n";
 			$html.="		transparent: \"TRUE\"\n";
 			$html.="		},\n";