Changeset 34728

Timestamp:

10/01/2015 02:09:41 AM (11 years ago)

Author:

wonderboymusic

Message:

Post List Table: Ensure that edit.php with no query string produces the proper markup and links in the date column header.

Add 2 methods to WP_List_Table, ->get_orderby() and ->get_order(). Override the methods in WP_Posts_List_Table.

WP_Posts_List_Table calls wp_edit_posts_query() in ->prepare_items() which is a wrapper for wp(). As such, we can obtain orderby and order via get_query_var(), instead of the URL.

Fixes #25493.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-list-table.php (modified) (2 diffs)
• class-wp-posts-list-table.php (modified) (2 diffs)
• post.php (modified) (1 diff)

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

@@ -1008 +1008 @@
 
         /**
+         * If 'orderby' is set, return it.
+         *
+         * @access protected
+         * @since 4.4.0
+         *
+         * @return string The value of 'orderby' or empty string.
+         */
+        protected function get_orderby() {
+                if ( isset( $_GET['orderby'] ) ) {
+                        return $_GET['orderby'];
+                }
+
+                return '';
+        }
+
+        /**
+         * If 'order' is 'desc', return it. Else return 'asc'.
+         *
+         * @access protected
+         * @since 4.4.0
+         *
+         * @return string 'desc' or 'asc'.
+         */
+        protected function get_order() {
+                if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
+                        return 'desc';
+                }
+
+                return 'asc';
+        }
+
+        /**
          * Print column headers, accounting for hidden and sortable columns.
          *
@@ -1023 +1055 @@
                 $current_url = remove_query_arg( 'paged', $current_url );
 
-                if ( isset( $_GET['orderby'] ) )
-                        $current_orderby = $_GET['orderby'];
-                else
-                        $current_orderby = '';
-
-                if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] )
-                        $current_order = 'desc';
-                else
-                        $current_order = 'asc';
+                $current_orderby = $this->get_orderby();
+                $current_order = $this->get_order();
 
                 if ( ! empty( $columns['cb'] ) ) {

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

@@ -122 +122 @@
 
         /**
+         * Get the value of the 'orderby' query var.
+         *
+         * @access protected
+         * @since 4.4.0
+         *
+         * @return string The value of 'orderby'.
+         */
+        protected function get_orderby() {
+                return strtolower( get_query_var( 'orderby' ) );
+        }
+
+        /**
+         * Get the value of the 'order' query var.
+         *
+         * @access protected
+         * @since 4.4.0
+         *
+         * @return string The value of 'order'.
+         */
+        protected function get_order() {
+                return strtolower( get_query_var( 'order' ) );
+        }
+
+        /**
          *
          * @global array    $avail_post_stati
@@ -131 +155 @@
                 global $avail_post_stati, $wp_query, $per_page, $mode;
 
+                // is going to call wp()
                 $avail_post_stati = wp_edit_posts_query();
 

trunk/src/wp-admin/includes/post.php

@@ -1005 +1005 @@
         }
 
-        if ( isset($q['orderby']) )
+        if ( isset( $q['orderby'] ) ) {
                 $orderby = $q['orderby'];
-        elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) )
+        } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
                 $orderby = 'modified';
-
-        if ( isset($q['order']) )
+        } else {
+                $orderby = 'date';
+        }
+
+        if ( isset( $q['order'] ) ) {
                 $order = $q['order'];
-        elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] )
+        } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
                 $order = 'ASC';
+        } else {
+                $order = 'desc';
+        }
 
         $per_page = "edit_{$post_type}_per_page";