Changeset 35819

Timestamp:

12/07/2015 08:07:20 PM (11 years ago)

Author:

ocean90

Message:

List Tables: Revert [34728] and [35482].

Part of [34728] was already reverted in [35682], but the default values still made it impossible to set a default ordering for custom post types.

Merge of [35818] for the 4.4 branch.

See #25493.
Fixes #34825.

Location:

branches/4.4/src/wp-admin/includes

Files:

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

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

@@ -1038 +1038 @@
 
         /**
-         * 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.
          *
@@ -1085 +1053 @@
                 $current_url = remove_query_arg( 'paged', $current_url );
 
-                $current_orderby = $this->get_orderby();
-                $current_order = $this->get_order();
+                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';
+                }
 
                 if ( ! empty( $columns['cb'] ) ) {

branches/4.4/src/wp-admin/includes/post.php

@@ -1009 +1009 @@
         } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
                 $orderby = 'modified';
-        } elseif ( ! is_post_type_hierarchical( $post_type ) ) {
-                $orderby = 'date';
         }
 
@@ -1017 +1015 @@
         } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
                 $order = 'ASC';
-        } else {
-                $order = 'desc';
         }