[fusion-commits] r1615 - branches/fusion-1.1/MapGuide/php

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-10-27 14:07:02 -0400 (Mon, 27 Oct 2008)
New Revision: 1615

Modified:
   branches/fusion-1.1/MapGuide/php/Query.php
Log:
re #94: patch applied

Modified: branches/fusion-1.1/MapGuide/php/Query.php
===================================================================
--- branches/fusion-1.1/MapGuide/php/Query.php	2008-10-27 17:38:07 UTC (rev 1614)
+++ branches/fusion-1.1/MapGuide/php/Query.php	2008-10-27 18:07:02 UTC (rev 1615)
@@ -160,14 +160,15 @@
               $layerFilter = $xpathQuery->item(0)->nodeValue;
             }
             /* create the combined filter value*/
+            $combinedFilter = '';
             if ($filter!='' && $layerFilter!='') {
-                $filter = "(".$filter.") AND (".$layerFilter.")";
+                $combinedFilter = "(".$filter.") AND (".$layerFilter.")";
             } else {
-                $filter = $filter.$layerFilter;
+                $combinedFilter = $filter.$layerFilter;
             }
-            if ($filter!='') {
-              //echo "/* setting filter:".$filter."*/";
-              $queryOptions->SetFilter($filter);
+            if ($combinedFilter!='') {
+              //echo "/* setting combinedFilter:".$combinedFilter."*/";
+              $queryOptions->SetFilter($combinedFilter);
             }
 
             if ($spatialFilter !== false ) {