Apply patch from ticket #5348 provided by René-Luc D'Hont

qgis · Apr 13, 2012 · a5b3a49 · a5b3a49
1 parent f9e2df4
commit a5b3a49
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1317,7 +1317,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.isEmpty() )
+        {
+          attributeName = aliasName;
+        }
       }
 
       QDomElement attributeElement = infoDocument.createElement( "Attribute" );