[mapserver-commits] r9063 - trunk/mapserver/mapscript/php3

[svn at osgeo.org]

Author: dmorissette
Date: 2009-06-02 08:38:55 -0400 (Tue, 02 Jun 2009)
New Revision: 9063

Modified:
   trunk/mapserver/mapscript/php3/mapscript_i.c
Log:
Fix MapScript whichShapes() to respect filters AND return all items (#2689)

Modified: trunk/mapserver/mapscript/php3/mapscript_i.c
===================================================================
--- trunk/mapserver/mapscript/php3/mapscript_i.c	2009-06-02 12:38:19 UTC (rev 9062)
+++ trunk/mapserver/mapscript/php3/mapscript_i.c	2009-06-02 12:38:55 UTC (rev 9063)
@@ -401,11 +401,16 @@
 
 
 int layerObj_whichShapes(layerObj *self, rectObj *poRect) {
-  /* 
-  ** We assume folks use this like a simple query so retrieve all items with each shape.
-  */
-  if(msLayerWhichItems(self, MS_TRUE, MS_FALSE, NULL) != MS_SUCCESS) return MS_FAILURE;
-  return msLayerWhichShapes(self, *poRect);
+    int oldconnectiontype = self->connectiontype;
+    self->connectiontype = MS_INLINE;
+
+    if(msLayerWhichItems(self, MS_TRUE, MS_FALSE, NULL) != MS_SUCCESS) {
+        self->connectiontype = oldconnectiontype;
+        return MS_FAILURE;
+    }
+    self->connectiontype = oldconnectiontype;
+
+    return msLayerWhichShapes(self, *poRect);
 }