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

[svn_fusion at osgeo.org]

Author: jng
Date: 2016-09-19 08:49:43 -0700 (Mon, 19 Sep 2016)
New Revision: 2959

Modified:
   branches/fusion-mg26/
   branches/fusion-mg26/widgets/Search/Search.php
Log:
Merged revision(s) 2956 from trunk:
#652: Escape single-quotes in search input
........



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/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
   + /branches/fusion-mg24:2560
/sandbox/adsk/2.6l:2911
/sandbox/adsk/3.1n:2925-2927
/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

Modified: branches/fusion-mg26/widgets/Search/Search.php
===================================================================
--- branches/fusion-mg26/widgets/Search/Search.php	2016-09-19 15:49:29 UTC (rev 2958)
+++ branches/fusion-mg26/widgets/Search/Search.php	2016-09-19 15:49:43 UTC (rev 2959)
@@ -86,6 +86,8 @@
         {
             trigger_error(FormatMessage("SEARCHLAYERNOTFOUND", $locale, array($layerName)));
         }
+        
+        $userInput = str_replace("'", "''", $userInput);
 
         //unescape strings
         //