Consider case where id is layer name

mhugent · mhugent · commit 9ed7b0df42d7 · 2019-01-05T15:16:39.000+01:00
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -690,7 +690,11 @@ namespace QgsWms
         if ( cLayer )
         {
           QString layerName = cLayer->shortName();
-          if ( layerName.isEmpty() )
+          if ( QgsServerProjectUtils::wmsUseLayerIds( *project ) )
+          {
+            layerName = cLayer->id();
+          }
+          else if ( layerName.isEmpty() )
           {
             layerName = cLayer->name();
           }

Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,11 @@ namespace QgsWms`
`690`	`690`	`if ( cLayer )`
`691`	`691`	`{`
`692`	`692`	`QString layerName = cLayer->shortName();`
`693`		`- if ( layerName.isEmpty() )`
	`693`	`+ if ( QgsServerProjectUtils::wmsUseLayerIds( *project ) )`
	`694`	`+ {`
	`695`	`+ layerName = cLayer->id();`
	`696`	`+ }`
	`697`	`+ else if ( layerName.isEmpty() )`
`694`	`698`	`{`
`695`	`699`	`layerName = cLayer->name();`
`696`	`700`	`}`