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

Timestamp:

12/07/2015 07:15:16 PM (9 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.

See #25493.
See #34825.

File:

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

trunk/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'] ) ) {