[fusion-commits] r2948 - in branches/fusion-mg30: . widgets/Query/classes

[svn_fusion at osgeo.org]

Author: jng
Date: 2016-07-26 09:16:15 -0700 (Tue, 26 Jul 2016)
New Revision: 2948

Modified:
   branches/fusion-mg30/
   branches/fusion-mg30/widgets/Query/classes/query.php
Log:
Merged revision(s) 2946 from trunk:
#650: Double-quote FDO properties in query widget to ensure properties with spaces and parentheses will work.

Patch by Gordon Luckett. Reviewed by me
........



Property changes on: branches/fusion-mg30
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/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
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
/trunk:2896-2899,2905-2908,2915,2920-2932,2936-2942
   + /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/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
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
/trunk:2896-2899,2905-2908,2915,2920-2932,2936-2942,2946

Modified: branches/fusion-mg30/widgets/Query/classes/query.php
===================================================================
--- branches/fusion-mg30/widgets/Query/classes/query.php	2016-07-26 16:16:05 UTC (rev 2947)
+++ branches/fusion-mg30/widgets/Query/classes/query.php	2016-07-26 16:16:15 UTC (rev 2948)
@@ -258,7 +258,7 @@
         $propertyFilter = '';
         if ($this->args['USEPROPERTYFILTER'] == 'true')
         {
-            $propertyFilter = $this->args['PROPERTYNAME'];
+            $propertyFilter = '"' . $this->args['PROPERTYNAME'] . '"';
             if ($this->args['ISSTRING'] == 'true')
                 $propertyFilter .= sprintf($this->strExpressions[$this->args['OPERATOR']], $this->args['VALUE']);
             else