Merge branch '2953-strange-facet-item-order' of https://github.com/to…

…rfsen/ckan into torfsen-2953-strange-facet-item-order

ckan/lib/helpers.py

@@ -718,7 +718,8 @@ def get_facet_items_dict(facet, limit=None, exclude_active=False):
             facets.append(dict(active=False, **facet_item))
         elif not exclude_active:
             facets.append(dict(active=True, **facet_item))
-    facets = sorted(facets, key=lambda item: item['count'], reverse=True)
+    # Sort descendingly by count and ascendingly by case-sensitive display name
+    facets.sort(key=lambda it: (-it['count'], it['display_name'].lower()))
     if c.search_facets_limits and limit is None:
         limit = c.search_facets_limits.get(facet)
     # zero treated as infinite for hysterical raisins