[BUGFIX][SERVER] GetFeatureInfo not evaluated for maptip context when…

… using FILTER param fixed #16670
qgis · Jul 26, 2017 · b51d4ef · b51d4ef
1 parent 476b584
commit b51d4ef
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2363,16 +2363,15 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
       break;
     }
 
+    renderContext.expressionContext().setFeature( feature );
+
     if ( layer->wkbType() != QGis::WKBNoGeometry && ! searchRect.isEmpty() )
     {
       if ( !r2 )
       {
         continue;
       }
 
-      renderContext.expressionContext().setFeature( feature );
-
-
       //check if feature is rendered at all
       bool render = r2->willRenderFeature( feature, renderContext );
       if ( !render )