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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-08-28 08:34:01 -0400 (Fri, 28 Aug 2009)
New Revision: 4544

Modified:
   trunk/mapbender/http/classes/class_wmc.php
Log:


Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2009-08-28 12:33:37 UTC (rev 4543)
+++ trunk/mapbender/http/classes/class_wmc.php	2009-08-28 12:34:01 UTC (rev 4544)
@@ -459,7 +459,11 @@
 	 * @return 
 	 */
 	public function mergeWmsArray ($wmsArray) {
-		$this->mainMap->mergeWmsArray($wmsArray);
+		if (func_num_args() > 1) {
+			$options = func_get_arg(1);
+			$this->mainMap->mergeWmsArray($wmsArray, $options);
+		}
+		return $this->mainMap->mergeWmsArray($wmsArray);
 	}
 
 // ---------------------------------------------------------------------------