[fusion-commits] r2816 - trunk/layers/MapGuide/php

[svn_fusion at osgeo.org]

Author: jng
Date: 2013-11-21 19:13:31 -0800 (Thu, 21 Nov 2013)
New Revision: 2816

Modified:
   trunk/layers/MapGuide/php/LoadMap.php
Log:
#608: Remove all traces of addslashes() from LoadMap.php as var2json() that is called on the final object takes care of any unruly string characters.

Modified: trunk/layers/MapGuide/php/LoadMap.php
===================================================================
--- trunk/layers/MapGuide/php/LoadMap.php	2013-11-18 02:12:54 UTC (rev 2815)
+++ trunk/layers/MapGuide/php/LoadMap.php	2013-11-22 03:13:31 UTC (rev 2816)
@@ -117,9 +117,9 @@
     $mapObj->wkt = $srs;
     $mapObj->epsg = $epsgCode;
 
-    $mapObj->mapTitle=addslashes($mapTitle);
+    $mapObj->mapTitle = $mapTitle;
 
-    $mapObj->mapName=addslashes($mapName);
+    $mapObj->mapName = $mapName;
     
     //Any code that may need the map definition xml document can use $mdfDoc
     $mapContent = $resourceService->GetResourceContent(new MgResourceIdentifier($mapid));
@@ -174,7 +174,7 @@
         $_SESSION['property_mappings'][$layer->GetObjectId()] = $mappings;
 
         $layerObj->uniqueId = $layer->GetObjectId();
-        $layerObj->layerName = addslashes($layer->GetName());
+        $layerObj->layerName = $layer->GetName();
 
         //$aLayerTypes = GetLayerTypes($featureService, $layer);
         $aLayerTypes = GetLayerTypesFromResourceContent($layer, $layerContent);
@@ -419,8 +419,8 @@
 {
     $groupObj = NULL;
 
-    $groupObj->groupName = addslashes($group->GetName());
-    $groupObj->legendLabel = addslashes($group->GetLegendLabel());
+    $groupObj->groupName = $group->GetName();
+    $groupObj->legendLabel = $group->GetLegendLabel();
     $groupObj->uniqueId = $group->GetObjectId();
     $groupObj->displayInLegend = $group->GetDisplayInLegend();
     $groupObj->expandInLegend = $group->GetExpandInLegend();