From 263d89c334232db27c363fac024c84dd602b52d7 Mon Sep 17 00:00:00 2001
From: rldhont <rldhont@gmail.com>
Date: Thu, 21 May 2015 13:51:37 +0200
Subject: [PATCH] [BUGFIX] GetFeatureInfo STYLES and FILTER used together

In GetFeatureInfo WMS Request, if STYLES and FILTER are used together, it's
 like FILTER is not applied.

To fix it, we check in the QgsMapLayerRegistry if the layers associated to
 QUERY_LAYERS has already created.
---
 src/server/qgswmsserver.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
index dc8eaa263b0..ed0e7434889 100644
--- a/src/server/qgswmsserver.cpp
+++ b/src/server/qgswmsserver.cpp
@@ -1497,6 +1497,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
       {
         continue;
       }
+      QgsMapLayer * registeredMapLayer = QgsMapLayerRegistry::instance()->mapLayer( currentLayer->id() );
+      if ( registeredMapLayer )
+      {
+        currentLayer = registeredMapLayer;
+      }
 
       //skip layer if not visible at current map scale
       bool useScaleConstraint = ( scaleDenominator > 0 && currentLayer->hasScaleBasedVisibility() );