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

Timestamp:

09/19/2012 12:43:31 PM (14 years ago)

Author:

ryan

Message:

Reduce reliance on global variables in the list tables. Allow passing a screen ID to the list tables so that ajax handlers can set the needed screen.

Props nacin
fixes #21871

File:

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

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

@@ -46 +46 @@
     var $sticky_posts_count = 0;
 
-    function __construct() {
+    function __construct( $args = array() ) {
         global $post_type_object, $wpdb;
 
-        $post_type = get_current_screen()->post_type;
+        parent::__construct( array(
+            'plural' => 'posts',
+            'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+        ) );
+
+        $post_type = $this->screen->post_type;
         $post_type_object = get_post_type_object( $post_type );
 
@@ -67 +72 @@
             $this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status != 'trash' AND ID IN ($sticky_posts)", $post_type ) );
         }
-
-        parent::__construct( array(
-            'plural' => 'posts',
-        ) );
     }
 
     function ajax_user_can() {
-        global $post_type_object;
-
-        return current_user_can( $post_type_object->cap->edit_posts );
+        return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
     }
 
     function prepare_items() {
-        global $post_type_object, $avail_post_stati, $wp_query, $per_page, $mode;
+        global $avail_post_stati, $wp_query, $per_page, $mode;
 
         $avail_post_stati = wp_edit_posts_query();
 
-        $this->hierarchical_display = ( $post_type_object->hierarchical && 'menu_order title' == $wp_query->query['orderby'] );
+        $this->hierarchical_display = ( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' == $wp_query->query['orderby'] );
 
         $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
 
-        $post_type = $post_type_object->name;
+        $post_type = $this->screen->post_type;
         $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
         $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
@@ -113 +112 @@
 
     function no_items() {
-        global $post_type_object;
-
         if ( isset( $_REQUEST['post_status'] ) && 'trash' == $_REQUEST['post_status'] )
-            echo $post_type_object->labels->not_found_in_trash;
+            echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
         else
-            echo $post_type_object->labels->not_found;
+            echo get_post_type_object( $this->screen->post_type )->labels->not_found;
     }
 
     function get_views() {
-        global $post_type_object, $locked_post_status, $avail_post_stati;
-
-        $post_type = $post_type_object->name;
+        global $locked_post_status, $avail_post_stati;
+
+        $post_type = $this->screen->post_type;
 
         if ( !empty($locked_post_status) )
@@ -199 +196 @@
 
     function extra_tablenav( $which ) {
-        global $post_type_object, $cat;
+        global $cat;
 ?>
         <div class="alignleft actions">
@@ -205 +202 @@
         if ( 'top' == $which && !is_singular() ) {
 
-            $this->months_dropdown( $post_type_object->name );
-
-            if ( is_object_in_taxonomy( $post_type_object->name, 'category' ) ) {
+            $this->months_dropdown( $this->screen->post_type );
+
+            if ( is_object_in_taxonomy( $this->screen->post_type, 'category' ) ) {
                 $dropdown_options = array(
                     'show_option_all' => __( 'View all categories' ),
@@ -222 +219 @@
         }
 
-        if ( $this->is_trash && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
+        if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
             submit_button( __( 'Empty Trash' ), 'small apply', 'delete_all', false );
         }
@@ -238 +235 @@
 
     function pagination( $which ) {
-        global $post_type_object, $mode;
+        global $mode;
 
         parent::pagination( $which );
 
-        if ( 'top' == $which && !$post_type_object->hierarchical )
+        if ( 'top' == $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
             $this->view_switcher( $mode );
     }
 
     function get_table_classes() {
-        global $post_type_object;
-
-        return array( 'widefat', 'fixed', $post_type_object->hierarchical ? 'pages' : 'posts' );
+        return array( 'widefat', 'fixed', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
     }
 
     function get_columns() {
-        $screen = get_current_screen();
-
-        if ( empty( $screen ) )
-            $post_type = 'post';
-        else
-            $post_type = $screen->post_type;
+        $post_type = $this->screen->post_type;
 
         $posts_columns = array();
@@ -314 +304 @@
 
     function display_rows( $posts = array(), $level = 0 ) {
-        global $wp_query, $post_type_object, $per_page;
+        global $wp_query, $per_page;
 
         if ( empty( $posts ) )
@@ -702 +692 @@
         global $mode;
 
-        $screen = get_current_screen();
+        $screen = $this->screen;
 
         $post = get_default_post_to_edit( $screen->post_type );
@@ -734 +724 @@
         while ( $bulk < 2 ) { ?>
 
-        <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-$screen->post_type ";
-            echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-$screen->post_type" : "quick-edit-row quick-edit-row-$hclass inline-edit-$screen->post_type";
+        <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-" . $screen->post_type;
+            echo $bulk ? "bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : "quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
         ?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">