Ticket #4926: ticket_4926_changelist_multifield_ordering_r12379.2.diff

django/contrib/admin/views/main.py

@@ -138 +138 @@
         # manually-specified ordering from the query string.
         ordering = self.model_admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name]
 
-        if ordering[0].startswith('-'):
+        if len(ordering) > 1:
+            order_field, order_type = '', ''
+        elif ordering[0].startswith('-'):
             order_field, order_type = ordering[0][1:], 'desc'
         else:
             order_field, order_type = ordering[0], 'asc'

docs/ref/contrib/admin/index.txt

@@ -498 +498 @@
 
 If this isn't provided, the Django admin will use the model's default ordering.
 
-.. admonition:: Note
-
-    Django will only honor the first element in the list/tuple; any others
-    will be ignored.
-
 .. attribute:: ModelAdmin.prepopulated_fields
 
 Set ``prepopulated_fields`` to a dictionary mapping field names to the fields