Changeset 15653 for trunk/wp-admin/includes/template.php

Timestamp:

09/24/2010 01:35:06 PM (14 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/template.php (modified) (6 diffs)

trunk/wp-admin/includes/template.php

@@ -218 +218 @@
         echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
     }
+}
+
+/**
+ * Get the column headers for a screen
+ *
+ * @since 2.7.0
+ *
+ * @param string|object $screen The screen you want the headers for
+ * @return array Containing the headers in the format id => UI String
+ */
+function get_column_headers( $screen ) {
+    if ( is_string( $screen ) )
+        $screen = convert_to_screen( $screen );
+
+    global $_wp_column_headers;
+
+    if ( !isset( $_wp_column_headers[ $screen->id ] ) ) {
+        $_wp_column_headers[ $screen->id ] = apply_filters( 'manage_' . $screen->id . '_columns', $_wp_column_headers );
+    }
+
+    return $_wp_column_headers[ $screen->id ];
+}
+
+/**
+ * Get a list of hidden columns.
+ *
+ * @since 2.7.0
+ *
+ * @param string|object $screen The screen you want the hidden columns for
+ * @return array
+ */
+function get_hidden_columns( $screen ) {
+    if ( is_string( $screen ) )
+        $screen = convert_to_screen( $screen );
+
+    return (array) get_user_option( 'manage' . $screen->id . 'columnshidden' );
 }
 
@@ -296 +332 @@
     $wp_list_table = get_list_table('comments');
 
-    $columns = $wp_list_table->get_column_headers();
-    $hidden = array_intersect( array_keys( $columns ), array_filter( $wp_list_table->get_hidden_columns() ) );
+    list ( $columns, $hidden ) = $wp_list_table->get_column_info();
+    $hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
     $col_count = count($columns) - count($hidden);
 
@@ -1284 +1320 @@
     }
     echo $output;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $page
- */
-function manage_columns_prefs( $page ) {
-    global $wp_list_table;
-
-    list( $columns, $hidden ) = $wp_list_table->get_column_headers();
-
-    $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username');
-
-    foreach ( $columns as $column => $title ) {
-        // Can't hide these for they are special
-        if ( in_array( $column, $special ) )
-            continue;
-        if ( empty( $title ) )
-            continue;
-
-        if ( 'comments' == $column )
-            $title = __( 'Comments' );
-        $id = "$column-hide";
-        echo '<label for="' . $id . '">';
-        echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . (! in_array($column, $hidden) ? ' checked="checked"' : '') . ' />';
-        echo "$title</label>\n";
-    }
 }
 
@@ -1635 +1641 @@
         $screen = convert_to_screen($screen);
 
-    if ( is_a($wp_list_table, 'WP_List_Table') )
-        list( $screen_columns ) = $wp_list_table->get_column_headers();
+    $columns = get_column_headers( $screen );
+    $hidden = get_hidden_columns( $screen );
+
     $meta_screens = array('index' => 'dashboard');
 
@@ -1645 +1652 @@
 
     $show_screen = false;
-    if ( !empty($wp_meta_boxes[$screen->id]) || !empty($screen_columns) )
+    if ( !empty($wp_meta_boxes[$screen->id]) || !empty($columns) )
         $show_screen = true;
 
@@ -1678 +1685 @@
         </div>
         <?php endif;
-        if ( ! empty($screen_columns) ) : ?>
-        <h5><?php echo ( isset( $screen_columns['_title'] ) ?  $screen_columns['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
+        if ( ! empty($columns) ) : ?>
+        <h5><?php echo ( isset( $columns['_title'] ) ?  $columns['_title'] :  _x('Show on screen', 'Columns') ) ?></h5>
         <div class="metabox-prefs">
-            <?php manage_columns_prefs($screen); ?>
+<?php
+    $special = array('_title', 'cb', 'comment', 'media', 'name', 'title', 'username');
+
+    foreach ( $columns as $column => $title ) {
+        // Can't hide these for they are special
+        if ( in_array( $column, $special ) )
+            continue;
+        if ( empty( $title ) )
+            continue;
+
+        if ( 'comments' == $column )
+            $title = __( 'Comments' );
+        $id = "$column-hide";
+        echo '<label for="' . $id . '">';
+        echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( !in_array($column, $hidden), true, false ) . ' />';
+        echo "$title</label>\n";
+    }
+?>
             <br class="clear" />
         </div>