Remove duplicated line

MapServer · Feb 21, 2020 · f56b120 · f56b120
1 parent fbc6f88
commit f56b120
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/mapmssql2008.c b/mapmssql2008.c
@@ -1488,11 +1488,13 @@ static int prepare_database(layerObj *layer, rectObj rect, char **query_string)
   if (paging_query) {
       paging_query = msStringConcatenate(paging_query, "[geom], [id] FROM (");
       query = msStringConcatenate(query, "]) 'id', row_number() over (");
+      if (layerinfo->sort_spec) {
+          query = msStringConcatenate(query, layerinfo->sort_spec);
+      }
 
       if (layer->sortBy.nProperties > 0) {
           tmp = msLayerBuildSQLOrderBy(layer);
           if (layerinfo->sort_spec) {
-              query = msStringConcatenate(query, layerinfo->sort_spec);
               query = msStringConcatenate(query, ", ");
           }
           else {
@@ -1502,10 +1504,8 @@ static int prepare_database(layerObj *layer, rectObj rect, char **query_string)
           msFree(tmp);
       }
       else {
-          if (layerinfo->sort_spec) {
-              query = msStringConcatenate(query, layerinfo->sort_spec);
-          }
-          else {
+          if (!layerinfo->sort_spec) {
+              // use the unique Id as the default sort for paging
               query = msStringConcatenate(query, "ORDER BY ");
               query = msStringConcatenate(query, layerinfo->urid_name);
           }