[fusion-commits] r3002 - in branches/fusion-mg26: . widgets/Search

svn_fusion at osgeo.org svn_fusion at osgeo.org
Wed Jun 21 07:51:46 PDT 2017


Author: jng
Date: 2017-06-21 07:51:46 -0700 (Wed, 21 Jun 2017)
New Revision: 3002

Modified:
   branches/fusion-mg26/
   branches/fusion-mg26/widgets/Search/SearchPrompt.php
Log:
Merged revision(s) 2999 from trunk:
#657: Escape double quotes in search filters as double-quote is a legitimate FDO property name qualifier.
........



Property changes on: branches/fusion-mg26
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925-2927
/sandbox/adsk/3.2o:2969-2972,2974,2978-2984
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/trunk:2847,2850,2857,2859,2862-2863,2872,2877,2880,2882,2884,2893-2897,2899,2905-2908,2915,2920-2932,2936-2942,2946,2950,2956,2960,2964,2993-2995
   + /branches/fusion-mg24:2560
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925-2927
/sandbox/adsk/3.2o:2969-2972,2974,2978-2984
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/trunk:2847,2850,2857,2859,2862-2863,2872,2877,2880,2882,2884,2893-2897,2899,2905-2908,2915,2920-2932,2936-2942,2946,2950,2956,2960,2964,2993-2995,2999

Modified: branches/fusion-mg26/widgets/Search/SearchPrompt.php
===================================================================
--- branches/fusion-mg26/widgets/Search/SearchPrompt.php	2017-06-21 14:51:30 UTC (rev 3001)
+++ branches/fusion-mg26/widgets/Search/SearchPrompt.php	2017-06-21 14:51:46 UTC (rev 3002)
@@ -45,7 +45,7 @@
     SetLocalizedFilesPath(GetLocalizationPath());
     $templ = Localize($templ, $locale, GetClientOS());
     $vpath = GetSurroundVirtualPath();
-    print sprintf($templ, $popup, $properties, $propNames, $title, $prompt, $target, $filter, $layer, $limit, $vpath."Search.php", $mapName, $sessionId, $locale, $pointZoomLevel);
+    print sprintf($templ, $popup, $properties, $propNames, $title, $prompt, $target, str_replace("\"", "\\\"", $filter), $layer, $limit, $vpath."Search.php", $mapName, $sessionId, $locale, $pointZoomLevel);
 
 
 



More information about the fusion-commits mailing list