WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove $post_type global usage from media list table. Correct $post_type to 'attachment' for upload screens. see #18722. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-11-21 20:48:57 +00:00
parent 3fcae6d702
commit 5f60ab4076
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-wp-media-list-table.php
View File

@ -84,13 +84,11 @@ class WP_Media_List_Table extends WP_List_Table {
}
function extra_tablenav( $which ) {
global $post_type;
$post_type_obj = get_post_type_object( $post_type );
?>
<div class="alignleft actions">
<?php
if ( 'top' == $which && !is_singular() && !$this->detached && !$this->is_trash ) {
$this->months_dropdown( $post_type );
$this->months_dropdown( 'attachment' );
do_action( 'restrict_manage_posts' );
submit_button( __( 'Filter' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) );

4
wp-admin/includes/screen.php
View File

@ -490,6 +490,10 @@ final class WP_Screen {
$taxonomy = 'post_tag';
$id = 'edit-' . $taxonomy;
break;
case 'upload' :
if ( null === $post_type )
$post_type = 'attachment';
break;
}
if ( $is_network ) {