Merged r24065 from trunk to 6.1-stable (#43378).

git-svn-id: https://svn.redmine.org/redmine/branches/6.1-stable@24066 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/queries_helper.rb

@@ -227,7 +227,7 @@ module QueriesHelper
       end
       content =
         link_to(
-          sprite_icon(icon, column.caption),
+          icon ? sprite_icon(icon, column.caption) : column.caption,
           {:params => request.query_parameters.deep_merge(sort_param)},
           link_options
         )

test/functional/issues_controller_test.rb

@@ -1242,6 +1242,12 @@ class IssuesControllerTest < Redmine::ControllerTest
       issues_in_list
     )
     assert_select 'table.issues.sort-by-tracker.sort-asc'
+
+    # Ensure that only the primary sort key column has a sort order icon
+    assert_select 'table.issues th.tracker svg', 1
+    css_select('table.issues th:not(.tracker)').each do |th|
+      assert_select th, 'svg', 0
+    end
   end
 
   def test_index_sort_by_field_not_included_in_columns