[mapserver-commits] r12012 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-08-05 11:59:19 -0700 (Fri, 05 Aug 2011)
New Revision: 12012

Modified:
   trunk/mapserver/mapwmslayer.c
Log:
Fix logic error in msPrepareWMSLayerRequest()  (#3764)

Modified: trunk/mapserver/mapwmslayer.c
===================================================================
--- trunk/mapserver/mapwmslayer.c	2011-08-05 13:57:52 UTC (rev 12011)
+++ trunk/mapserver/mapwmslayer.c	2011-08-05 18:59:19 UTC (rev 12012)
@@ -976,10 +976,11 @@
         return MS_FAILURE;
     }
 
-    else if (msBuildWMSLayerURL(map, lp, WMS_GETFEATUREINFO,
+    else if (nRequestType == WMS_GETFEATUREINFO &&
+             msBuildWMSLayerURL(map, lp, WMS_GETFEATUREINFO,
                                 nClickX, nClickY, nFeatureCount, pszInfoFormat,
                                 NULL, NULL, NULL,
-                                &sThisWMSParams) == MS_FAILURE)
+                                &sThisWMSParams) != MS_SUCCESS )
     {
         /* an error was already reported. */
         msFreeWmsParamsObj(&sThisWMSParams);