Ticket #25493: 25493.2.patch

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

@@ -1037 +1037 @@
         }
 
         /**
-         * 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.
          *
          * @since 3.1.0
@@ -1084 +1052 @@
                 $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
                 $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'] ) ) {
                         static $cb_counter = 1;
                         $columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'

src/wp-admin/includes/post.php

@@ -1008 +1008 @@
                 $orderby = $q['orderby'];
         } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
                 $orderby = 'modified';
-        } elseif ( ! is_post_type_hierarchical( $post_type ) ) {
-                $orderby = 'date';
         }
 
         if ( isset( $q['order'] ) ) {
                 $order = $q['order'];
         } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
                 $order = 'ASC';
-        } else {
-                $order = 'desc';
         }
 
         $per_page = "edit_{$post_type}_per_page";
@@ -1844 +1840 @@
          */
         wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
         exit;
-}
- No newline at end of file
+}