[Mapbender-commits] r5426 - branches/2.6/http/php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-01-25 04:40:33 -0500 (Mon, 25 Jan 2010)
New Revision: 5426

Modified:
   branches/2.6/http/php/mod_createJSObjFromDBByWMS.php
Log:


Modified: branches/2.6/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- branches/2.6/http/php/mod_createJSObjFromDBByWMS.php	2010-01-25 09:40:14 UTC (rev 5425)
+++ branches/2.6/http/php/mod_createJSObjFromDBByWMS.php	2010-01-25 09:40:33 UTC (rev 5426)
@@ -31,13 +31,19 @@
 $admin = new administration();
 if ($admin->getWmsPermission($wms_id, $user_id)) {
 	$mywms = new wms();
-	if ($gui_id !== '') {
+	if(isset($gui_id) && $gui_id!='undefined'){
 		$mywms->createObjFromDB($gui_id, $wms_id);
 	}
 	else{
 		$mywms->createObjFromDBNoGui($wms_id);	
 	}
-	$output = $mywms->createJsObjFromWMS_(true);
+
+	if ($noHtml) {
+		$output .= $mywms->createJsObjFromWMS_(false);
+	}
+	else {
+		$output .= $mywms->createJsObjFromWMS_(true);
+	}
 	$js .= administration::convertOutgoingString($output);
 	unset($output);
 }