multi-layer query broken when one of the layer defines a feature filter

[tomfukushima]

See the MapGuide trac ticket for more details:  http://trac.osgeo.org/mapguide/ticket/651. A patch is attached for your review. In case the patch doesn't work (because I hand edited the paths) the corresponding MG change is  http://trac.osgeo.org/mapguide/changeset/3260.

[edzimmerman]

I attached a package containing an example map. To reproduce the defect 1) Apply the attached package. 2) In MapGuide Studio, create a fusion web layout referencnig the sample map contained in the package. 3) Launch the web browser on fusion web layout url. 4) Set layer visibility as follows: airprt020 (OFF); airprt020 filtered (ON); Sample_World_Countries (ON). 5) Do a window select around some points.

Before the fix, the selection will fail. After the fix, it will succeed. The problem was that use of the $filter variable in Query.php was being overloaded to both store the possible incoming sql filter and to store the possible combined filter of the sql filter and the layer's feature filter. I fixed this be adding a new $combinedFilter variable to eliminate the overloaded use of $filter.

[madair]

(In [1615]) re #94: patch applied

[madair]

(In [1616]) closes #94: patch applied to trunk

[tomfukushima]

Thanks Mike