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

Timestamp:

01/16/2011 09:34:38 PM (16 years ago)

Author:

nacin

Message:

Revert [17270], [17273], see #16166, see #16262.

File:

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

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

@@ -619 +619 @@
                 return count( $columns ) - count( $hidden );
         }
-        
-        function get_order_info() {
-                $current_orderby = isset( $_GET['orderby'] ) ? $_GET['orderby'] : '';
-
-                if ( ! $current_orderby )
-                        $current_order = '';
-                elseif ( isset( $_GET['order'] ) && 'desc' == $_GET['order'] )
+
+        /**
+         * Print column headers, accounting for hidden and sortable columns.
+         *
+         * @since 3.1.0
+         * @access protected
+         *
+         * @param bool $with_id Whether to set the id attribute or not
+         */
+        function print_column_headers( $with_id = true ) {
+                $screen = get_current_screen();
+
+                list( $columns, $hidden, $sortable ) = $this->get_column_info();
+
+                $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+
+                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';
-
-                return array( $current_orderby, $current_order );
-        }
-        
-        function add_query_args( $location ) {
-                $pagenum = $this->get_pagenum();
-                list( $current_orderby, $current_order ) = $this->get_order_info();
-                $location = add_query_arg( 'paged', $pagenum, $location );
-                if ( $current_orderby )
-                        $location = add_query_arg( array( 'orderby' => $current_orderby, 'order' => $current_order ), $location );
-
-                return $location;
-        }
-
-        /**
-         * Print column headers, accounting for hidden and sortable columns.
-         *
-         * @since 3.1.0
-         * @access protected
-         *
-         * @param bool $with_id Whether to set the id attribute or not
-         */
-        function print_column_headers( $with_id = true ) {
-                $screen = get_current_screen();
-
-                list( $columns, $hidden, $sortable ) = $this->get_column_info();
-
-                $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-
-                list( $current_orderby, $current_order ) = $this->get_order_info();
 
                 foreach ( $columns as $column_key => $column_display_name ) {
@@ -753 +738 @@
          */
         function display_tablenav( $which ) {
-                if ( 'top' == $which ) {
+                if ( 'top' == $which )
                         wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-                        list( $current_orderby, $current_order ) = $this->get_order_info();
-                        echo '<input type="hidden" name="orderby" value="' . esc_attr( $current_orderby ) . '" /><input type="hidden" name="order" value="' . esc_attr( $current_order ) . '" />';
-                }
 ?>
         <div class="tablenav <?php echo esc_attr( $which ); ?>">