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

Timestamp:

09/24/2010 01:35:06 PM (15 years ago)

Author:

scribu

Message:

Column headers revamp:

• undeprecate get_column_headers()
• undeprecate get_hidden_columns()
• in WP_List_Table, rename get_column_headers() to get_column_info()
• remove $taxonomy argument from single_row()
• merge manage_columns_prefs() into screen_meta()

Fixes #14952. Fixes #14776.

File:

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

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

@@ -70 +70 @@
      */
     function WP_List_Table( $args ) {
+        global $_wp_column_headers;
+
+        $_wp_column_headers = $this->get_columns();
 
         $args = wp_parse_args( $args, array(
@@ -82 +85 @@
         if ( is_string( $this->_screen ) )
             $this->_screen = convert_to_screen( $this->_screen );
+
+        add_filter( 'manage_' . $this->_screen->id . '_columns', array( $this, 'get_columns' ) );
 
         if ( !$args['plural'] )
@@ -515 +520 @@
 
     /**
-     * Get a list of hidden columns.
-     *
-     * @since 3.1.0
-     * @access private
+     * Get a list of all, hidden and sortable columns, with filter applied
+     *
+     * @since 3.1.0
+     * @access protected
      *
      * @return array
      */
-    function get_hidden_columns() {
-        return (array) get_user_option( 'manage' . $this->_screen->id. 'columnshidden' );
-    }
-
-    /**
-     * Get a list of all, hidden and sortable columns, with filter applied
-     *
-     * @since 3.1.0
-     * @access protected
-     *
-     * @return array
-     */
-    function get_column_headers() {
+    function get_column_info() {
         if ( !isset( $this->_column_headers ) ) {
-            $columns = apply_filters( 'manage_' . $this->_screen->id . '_columns', $this->get_columns() );
+            $columns = get_column_headers( $this->_screen );
+            $hidden = get_hidden_columns( $this->_screen );
             $sortable = apply_filters( 'manage_' . $this->_screen->id . '_sortable_columns', $this->get_sortable_columns() );
-            $hidden = $this->get_hidden_columns();
 
             $this->_column_headers = array( $columns, $hidden, $sortable );
@@ -557 +550 @@
         $screen = $this->_screen;
 
-        list( $columns, $hidden, $sortable ) = $this->get_column_headers();
+        list( $columns, $hidden, $sortable ) = $this->get_column_info();
 
         $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -747 +740 @@
      */
     function single_row_columns( $item ) {
-        list( $columns, $hidden ) = $this->get_column_headers();
+        list( $columns, $hidden ) = $this->get_column_info();
 
         foreach ( $columns as $column_name => $column_display_name ) {