Changeset 29690

Timestamp:

09/03/2014 06:46:34 AM (12 years ago)

Author:

nacin

Message:

Media Library: Fix media trash handling.

props ocean90, obenland.
fixes #29469.

Location:

trunk/src/wp-admin

Files:

• css/forms.css (modified) (1 diff)
• includes/class-wp-media-list-table.php (modified) (3 diffs)

trunk/src/wp-admin/css/forms.css

@@ -375 +375 @@
 .tablenav #changeit,
 .tablenav #delete_all,
-.tablenav #clear-recent-list {
+.tablenav #clear-recent-list,
+.wp-filter #delete_all {
         margin-top: 1px;
 }

trunk/src/wp-admin/includes/class-wp-media-list-table.php

@@ -38 +38 @@
                 list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
 
-                $this->is_trash = isset( $_REQUEST['status'] ) && 'trash' == $_REQUEST['status'];
+                $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' == $_REQUEST['attachment-filter'];
 
                 $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
@@ -64 +64 @@
                 $type_links['all'] = "<option value=''$selected>" . sprintf( _nx( 'All (%s)', 'All (%s)', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</option>';
                 foreach ( $post_mime_types as $mime_type => $label ) {
-                        $class = '';
-
                         if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
                                 continue;
@@ -99 +97 @@
                 <div class="actions">
 <?php
-                if ( ! is_singular() && ! $this->is_trash ) {
-                        $this->months_dropdown( 'attachment' );
+                if ( ! is_singular() ) {
+                        if ( ! $this->is_trash ) {
+                                $this->months_dropdown( 'attachment' );
+                        }
 
                         /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */