Changeset 48165

Timestamp:

06/25/2020 11:33:23 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Administration: Correct and simplify the logic for asc and desc arguments in WP_List_Table::get_sortable_columns().

Setting the initial order didn't work as expected due to reversed logic.

Follow-up to [48151].

See #45089.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-list-table.php (modified) (2 diffs)
• tests/phpunit/tests/admin/includesListTable.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -1171 +1171 @@
                     $class[] = $current_order;
                 } else {
-                    if ( in_array( strtolower( $desc_first ), array( 'desc', 'asc' ), true ) ) {
-                        $order = 'asc' === strtolower( $desc_first ) ? 'desc' : 'asc';
-                    } else {
+                    $order = strtolower( $desc_first );
+
+                    if ( ! in_array( $order, array( 'desc', 'asc' ), true ) ) {
                         $order = $desc_first ? 'desc' : 'asc';
                     }
@@ -1181 +1181 @@
                 }
 
-                $column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
+                $column_display_name = sprintf(
+                    '<a href="%s"><span>%s</span><span class="sorting-indicator"></span></a>',
+                    esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ),
+                    $column_display_name
+                );
             }
 

trunk/tests/phpunit/tests/admin/includesListTable.php

@@ -304 +304 @@
             'author'   => array( 'comment_author', true ),
             'response' => 'comment_post_ID',
-            'date'     => array( 'comment_date', 'dEsC' ), // The ordering support should be case insensitive.
+            'date'     => array( 'comment_date', 'dEsC' ), // The ordering support should be case-insensitive.
         );
 
@@ -325 +325 @@
         $this->assertContains( 'column-response sortable desc', $output, 'Mismatch of CSS classes for the comment post ID column.' );
 
-        $this->assertContains( '?orderby=comment_date&order=asc', $output, 'Mismatch of the default link ordering for comment author column. Should be asc.' );
-        $this->assertContains( 'column-date sortable desc', $output, 'Mismatch of CSS classes for the comment date column.' );
+        $this->assertContains( '?orderby=comment_date&order=desc', $output, 'Mismatch of the default link ordering for comment date column. Should be asc.' );
+        $this->assertContains( 'column-date sortable asc', $output, 'Mismatch of CSS classes for the comment date column.' );
     }