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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2010-08-23 13:24:59 +0000 (Mon, 23 Aug 2010)
New Revision: 6793

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
set gui_layer_title correctly

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2010-08-23 13:05:54 UTC (rev 6792)
+++ trunk/mapbender/http/classes/class_wms.php	2010-08-23 13:24:59 UTC (rev 6793)
@@ -958,17 +958,11 @@
 		
 		// check if gui_layer_title isset
 		for($i=0; $i<count($this->objLayer); $i++){
-			if(is_null($this->objLayer[$i]->gui_layer_title)) {
-				$this->objLayer[$i]->gui_layer_title = $this->objLayer[$i]->layer_title;
-			}	
-			
-			$this->objLayer[$i]->gui_layer_title != "" ?
+			$this->objLayer[$i]->gui_layer_title = $this->objLayer[$i]->gui_layer_title != "" ?
 				$this->objLayer[$i]->gui_layer_title :
 				$this->objLayer[$i]->layer_title;
-				
 		}
 		
-		
 		/* fill sld variables when empty */
 		if($this->wms_supportsld == ""){
 				$this->wms_supportsld = 0;
@@ -2556,7 +2550,8 @@
 			$layer_cnt=count($this->objLayer)-1;
 			$this->objLayer[$layer_cnt]->layer_uid = $row2["layer_id"];
 			$this->objLayer[$layer_cnt]->layer_name = administration::convertIncomingString($row2["layer_name"]);
-			$this->objLayer[$layer_cnt]->layer_title = administration::convertIncomingString($row2["layer_title"]);				
+			$this->objLayer[$layer_cnt]->layer_title = administration::convertIncomingString($row2["layer_title"]);	
+			$this->objLayer[$layer_cnt]->gui_layer_title = $this->objLayer[$layer_cnt]->layer_title;			
 			$this->objLayer[$layer_cnt]->layer_dataurl_href =$row2["layer_dataurl"];
 			$this->objLayer[$layer_cnt]->layer_metadataurl =$row2["layer_metadataurl"];
 			$this->objLayer[$layer_cnt]->layer_searchable =$row2["layer_searchable"];