From c3980fb9a6116ec478393e141090e2bb9faaff27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D'Hont=20Ren=C3=A9-Luc?= <rldhont@gmail.com>
Date: Fri, 13 Apr 2012 11:56:06 +0200
Subject: [PATCH] Testing if alias value is not empty before setting
 attributeName in GetFeatureInfo

---
 src/mapserver/qgswmsserver.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
index 492c427..70359f3 100644
--- a/src/mapserver/qgswmsserver.cpp
+++ b/src/mapserver/qgswmsserver.cpp
@@ -1313,7 +1313,11 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
       QMap<int, QString>::const_iterator aliasIt = aliasMap.find( it.key() );
       if ( aliasIt != aliasMap.constEnd() )
       {
-        attributeName = aliasIt.value();
+        QString aliasName = aliasIt.value();
+        if (aliasName != "")
+        {
+          attributeName = aliasName;
+        }
       }
 
       QDomElement attributeElement = infoDocument.createElement( "Attribute" );
-- 
1.7.5.4