Ticket #18722: 18722.no-global.1.diff

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

@@ -283 +283 @@
         }
 
         function column_posts( $tag ) {
-                global $taxonomy, $post_type;
+                global $taxonomy;
 
                 $count = number_format_i18n( $tag->count );
 
                 $tax = get_taxonomy( $taxonomy );
 
+                $post_type = get_current_screen()->post_type;
                 $ptype_object = get_post_type_object( $post_type );
+
                 if ( ! $ptype_object->show_ui )
                         return $count;
 

wp-admin/includes/screen.php

@@ -446 +446 @@
                 $base = $id;
 
                 // If this is the current screen, see if we can be more accurate for post types and taxonomies.
-                if ( ! $hook_name ) {
+                if ( true ) {
                         if ( isset( $_REQUEST['post_type'] ) )
                                 $post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
                         if ( isset( $_REQUEST['taxonomy'] ) )