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

Timestamp:

11/26/2010 02:03:02 AM (14 years ago)

Author:

scribu

Message:

Make date columns first sort in descending order. See #15580

File:

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

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

@@ -516 +516 @@
 
     /**
-     * Get a list of sortable columns. The format is internal_name => orderby
+     * Get a list of sortable columns. The format is: 
+     * 'internal-name' => 'orderby'
+     * or
+     * 'internal-name' => array( 'orderby', true )
+     *
+     * The second format will make the first sorting order be descending 
      *
      * @since 3.1.0
@@ -536 +541 @@
      */
     function get_column_info() {
-        if ( !isset( $this->_column_headers ) ) {
-            $screen = get_current_screen();
-
-            $columns = get_column_headers( $screen );
-            $hidden = get_hidden_columns( $screen );
-            $sortable = apply_filters( "manage_{$screen->id}_sortable_columns", $this->get_sortable_columns() );
-
-            $this->_column_headers = array( $columns, $hidden, $sortable );
-        }
+        if ( isset( $this->_column_headers ) )
+            return $this->_column_headers;
+
+        $screen = get_current_screen();
+
+        $columns = get_column_headers( $screen );
+        $hidden = get_hidden_columns( $screen );
+
+        $_sortable = apply_filters( "manage_{$screen->id}_sortable_columns", $this->get_sortable_columns() );
+
+        $sortable = array();
+        foreach ( $_sortable as $id => $data ) {
+            if ( empty( $data ) )
+                continue;
+
+            $data = (array) $data;
+            if ( !isset( $data[1] ) )
+                $data[1] = false;
+            
+            $sortable[$id] = $data;
+        }
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
 
         return $this->_column_headers;
@@ -603 +622 @@
 
             if ( isset( $sortable[$column_key] ) ) {
-                $orderby = $sortable[$column_key];
+                list( $orderby, $desc_first ) = $sortable[$column_key];
+
                 if ( $current_orderby == $orderby ) {
                     $order = 'asc' == $current_order ? 'desc' : 'asc';
-                    $class[] = "sorted-$current_order";
+                    $class[] = 'sorted';
+                    $class[] = $current_order;
                 } else {
-                    $order = 'asc';
+                    $order = $desc_first ? 'desc' : 'asc';
                     $class[] = 'sortable';
+                    $class[] = $desc_first ? 'asc' : 'desc';
                 }
+
                 $column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
             }