Ticket #38238: 38238.4.diff

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

@@ -143 +143 @@
                         'name'    => 'name',
                         'url'     => 'url',
                         'visible' => 'visible',
-                        'rating'  => 'rating'
+                        'rating'  => array(
+                                'query_var' => 'rating',
+                                'order'     => 'DESC',
+                        ),
                 );
         }
 

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

@@ -1006 +1006 @@
 
                 $sortable = array();
                 foreach ( $_sortable as $id => $data ) {
-                        if ( empty( $data ) )
+                        if ( empty( $data ) ) {
                                 continue;
+                        }
 
                         $data = (array) $data;
-                        if ( !isset( $data[1] ) )
+
+                        if ( isset( $data['query_var'] ) ) {
+                                if ( !isset( $data['order'] ) ) {
+                                        $data['order'] = 'ASC';
+                                }
+
+                                $data = array( $data['query_var'], ( $data['order'] == 'DESC' ) );
+                        }
+
+                        if ( !isset( $data[1] ) ) {
                                 $data[1] = false;
+                        }
 
                         $sortable[$id] = $data;
                 }

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

@@ -329 +329 @@
          */
         protected function get_sortable_columns() {
                 return array(
-                        'title'    => 'title',
-                        'author'   => 'author',
-                        'parent'   => 'parent',
-                        'comments' => 'comment_count',
-                        'date'     => array( 'date', true ),
+                        'title'         => 'title',
+                        'author'        => 'author',
+                        'parent'        => 'parent',
+                        'comments'      => array( 
+                                'query_var' => 'comment_count',
+                                'order'     => 'DESC',
+                        ),
+                        'date'          => array( 
+                                'query_var' => 'date',
+                                'order'     => 'DESC',
+                        ),
                 );
         }
 

src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -189 +189 @@
          */
         protected function get_sortable_columns() {
                 return array(
-                        'username'   => 'login',
-                        'name'       => 'name',
-                        'email'      => 'email',
-                        'registered' => 'id',
+                        'username'      => 'login',
+                        'name'          => 'name',
+                        'email'         => 'email',
+                        'registered'    => array(
+                                'query_var' => 'registered',
+                                'order'     => 'DESC',
+                        ),
                 );
         }
 

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

@@ -618 +618 @@
          */
         protected function get_sortable_columns() {
                 return array(
-                        'title'    => 'title',
-                        'parent'   => 'parent',
-                        'comments' => 'comment_count',
-                        'date'     => array( 'date', true )
+                        'title'         => 'title',
+                        'parent'        => 'parent',
+                        'comments'      => array( 
+                                'query_var' => 'comment_count',
+                                'order'     => 'DESC',
+                        ),
+                        'date'          => array(
+                                'query_var' => 'date',
+                                'order'     => 'DESC',
+                        ),
                 );
         }
 

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

@@ -197 +197 @@
          */
         protected function get_sortable_columns() {
                 return array(
-                        'name'        => 'name',
-                        'description' => 'description',
-                        'slug'        => 'slug',
-                        'posts'       => 'count',
-                        'links'       => 'count'
+                        'name'          => 'name',
+                        'description'   => 'description',
+                        'slug'          => 'slug',
+                        'posts'         => array(
+                                'query_var' => 'count',
+                                'order'     => 'DESC',
+                        ),
+                        'links'         => array(
+                                'query_var' => 'count',
+                                'order'     => 'DESC',
+                        ),
                 );
         }
 

tests/phpunit/tests/admin/includesListTable.php

@@ -262 +262 @@
 
                 $this->assertNotContains( 'id="delete_all"', $output );
         }
+
+        /**
+         * Helper function to test default sorting for sortable columns.
+         * @param WP_ListTable $table Table to check.
+         * @param array $columns      Column information to check for in table.
+         */
+        protected function _test_sortable_columns( WP_List_Table $table, array $columns ) {
+                ob_start();
+                $table->print_column_headers();
+                $output = ob_get_clean();
+
+                foreach( $columns as $col ) {
+                        $col_id = $col['id'];
+                        $col_orderby = $col['orderby'];
+                        $col_order = $col['order'];
+
+                        $search_pattern = "|<th[^>]*id=['\"]{$col_id}['\"][^>]*><a[^>]*>|";
+                        $matches = array();
+                        preg_match_all( $search_pattern, $output, $matches );
+
+                        $this->assertCount( 1, array_keys( $matches[0] ) );
+                        $this->assertContains( "orderby={$col_orderby}", $matches[0][0] );
+                        $this->assertContains( "order={$col_order}", $matches[0][0] );
+                }
+        }
+
+        /**
+         * @ticket 38238
+         */
+        public function test_comments_default_column_sorting() {
+                $table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+                $columns = array(
+                        array(
+                                'id' => 'author',
+                                'orderby' => 'comment_author',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'response',
+                                'orderby' => 'comment_post_ID',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'date',
+                                'orderby' => 'comment_date',
+                                'order' => 'asc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /**
+         * @ticket 38238
+         */
+        public function test_links_default_column_sorting() {
+                $table = _get_list_table( 'WP_Links_List_Table', array( 'screen' => 'link-manager' ) );
+                $columns = array(
+                        array(
+                                'id' => 'name',
+                                'orderby' => 'name',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'url',
+                                'orderby' => 'url',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'visible',
+                                'orderby' => 'visible',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'rating',
+                                'orderby' => 'rating',
+                                'order' => 'desc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /*
+         * @ticket 38238
+         */
+        public function test_link_categories_default_column_sorting() {
+                $table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => 'edit-link_category' ) );
+                $columns = array(
+                        array(
+                                'id' => 'name',
+                                'orderby' => 'name',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'description',
+                                'orderby' => 'description',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'slug',
+                                'orderby' => 'slug',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'links',
+                                'orderby' => 'count',
+                                'order' => 'desc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /**
+         * @ticket 38238
+         */
+        public function test_media_default_column_sorting() {
+                $table = _get_list_table( 'WP_Media_List_Table', array( 'screen' => 'upload' ) );
+                $columns = array(
+                        array(
+                                'id' => 'title',
+                                'orderby' => 'title',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'author',
+                                'orderby' => 'author',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'parent',
+                                'orderby' => 'parent',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'comments',
+                                'orderby' => 'comment_count',
+                                'order' => 'desc',
+                        ),
+                        array(
+                                'id' => 'date',
+                                'orderby' => 'date',
+                                'order' => 'desc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /*
+         * @ticket 38238
+         */
+        public function test_pages_default_column_sorting() {
+                $table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => 'edit-page' ) );
+                $columns = array(
+                        array(
+                                'id' => 'title',
+                                'orderby' => 'title',
+                                'order' => 'asc'
+                        ),
+                        array(
+                                'id' => 'comments',
+                                'orderby' => 'comment_count',
+                                'order' => 'desc'
+                        ),
+                        array(
+                                'id' => 'date',
+                                'orderby' => 'date',
+                                'order' => 'desc'
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /**
+         * @ticket 38238
+         */
+        public function test_posts_default_column_sorting() {
+                $table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => 'edit-post' ) );
+                $columns = array(
+                        array(
+                                'id' => 'title',
+                                'orderby' => 'title',
+                                'order' => 'asc'
+                        ),
+                        array(
+                                'id' => 'comments',
+                                'orderby' => 'comment_count',
+                                'order' => 'desc'
+                        ),
+                        array(
+                                'id' => 'date',
+                                'orderby' => 'date',
+                                'order' => 'desc'
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /*
+         * @ticket 38238
+         */
+        public function test_post_categories_default_column_sorting() {
+                $table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => 'edit-category' ) );
+                $columns = array(
+                        array(
+                                'id' => 'name',
+                                'orderby' => 'name',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'description',
+                                'orderby' => 'description',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'slug',
+                                'orderby' => 'slug',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'posts',
+                                'orderby' => 'count',
+                                'order' => 'desc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /**
+         * @ticket 38238
+         */
+        public function test_post_tags_default_column_sorting() {
+                $table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => 'edit-post_tags' ) );
+                $columns = array(
+                        array(
+                                'id' => 'name',
+                                'orderby' => 'name',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'description',
+                                'orderby' => 'description',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'slug',
+                                'orderby' => 'slug',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'posts',
+                                'orderby' => 'count',
+                                'order' => 'desc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
+
+        /**
+         * @ticket 38238
+         */
+        public function test_users_default_column_sorting() {
+                $table = _get_list_table( 'WP_MS_Users_List_Table', array( 'screen' => 'users' ) );
+                $columns = array(
+                        array(
+                                'id' => 'username',
+                                'orderby' => 'login',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'email',
+                                'orderby' => 'email',
+                                'order' => 'asc',
+                        ),
+                        array(
+                                'id' => 'registered',
+                                'orderby' => 'registered',
+                                'order' => 'desc',
+                        ),
+                );
+                $this->_test_sortable_columns( $table, $columns );
+        }
 }