Changeset 19192

Timestamp:

11/06/2011 09:14:27 PM (13 years ago)

Author:

nacin

Message:

Don't use $post_type global in the posts list table. props scribu, see #18475.

File:

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

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

@@ -47 +47 @@
 
     function __construct() {
-        global $post_type_object, $post_type, $wpdb;
+        global $post_type_object, $wpdb;
 
         if ( !isset( $_REQUEST['post_type'] ) )
@@ -87 +87 @@
 
     function prepare_items() {
-        global $post_type_object, $post_type, $avail_post_stati, $wp_query, $per_page, $mode;
+        global $post_type_object, $avail_post_stati, $wp_query, $per_page, $mode;
 
         $avail_post_stati = wp_edit_posts_query();
@@ -95 +95 @@
         $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
 
+        $post_type = $post_type_object->name;
         $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
         $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
@@ -128 +129 @@
 
     function get_views() {
-        global $post_type, $post_type_object, $locked_post_status, $avail_post_stati;
+        global $post_type_object, $locked_post_status, $avail_post_stati;
+
+        $post_type = $post_type_object->name;
 
         if ( !empty($locked_post_status) )
@@ -203 +206 @@
 
     function extra_tablenav( $which ) {
-        global $post_type, $post_type_object, $cat;
+        global $post_type_object, $cat;
 ?>
         <div class="alignleft actions">
@@ -209 +212 @@
         if ( 'top' == $which && !is_singular() ) {
 
-            $this->months_dropdown( $post_type );
-
-            if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
+            $this->months_dropdown( $post_type_object->name );
+
+            if ( is_object_in_taxonomy( $post_type_object->name, 'category' ) ) {
                 $dropdown_options = array(
                     'show_option_all' => __( 'View all categories' ),