[Mapbender-commits] r4827 - branches/2.6/http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-10-20 08:14:31 -0400 (Tue, 20 Oct 2009)
New Revision: 4827

Modified:
   branches/2.6/http/classes/class_wmc.php
Log:


Modified: branches/2.6/http/classes/class_wmc.php
===================================================================
--- branches/2.6/http/classes/class_wmc.php	2009-10-20 12:14:02 UTC (rev 4826)
+++ branches/2.6/http/classes/class_wmc.php	2009-10-20 12:14:31 UTC (rev 4827)
@@ -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);
 	}
 
 // ---------------------------------------------------------------------------