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

Media Library: Fix media trash handling. 

props ocean90, obenland.
fixes #29469.

Built from https://develop.svn.wordpress.org/trunk@29690


git-svn-id: http://core.svn.wordpress.org/trunk@29465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-09-03 06:47:16 +00:00
parent cb242bb358
commit 8a9186b878
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/css/forms-rtl.css
View File

@ -374,7 +374,8 @@ input[type="number"].small-text {
.tablenav #changeit, .tablenav #changeit,
.tablenav #delete_all, .tablenav #delete_all,
.tablenav #clear-recent-list { .tablenav #clear-recent-list,
.wp-filter #delete_all {
margin-top: 1px; margin-top: 1px;
} }

3
wp-admin/css/forms.css
View File

@ -374,7 +374,8 @@ input[type="number"].small-text {
.tablenav #changeit, .tablenav #changeit,
.tablenav #delete_all, .tablenav #delete_all,
.tablenav #clear-recent-list { .tablenav #clear-recent-list,
.wp-filter #delete_all {
margin-top: 1px; margin-top: 1px;
} }

2
wp-admin/css/login-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/login.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -37,7 +37,7 @@ class WP_Media_List_Table extends WP_List_Table {
list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST ); 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']; $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
@ -63,8 +63,6 @@ class WP_Media_List_Table extends WP_List_Table {
$selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : ''; $selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : '';
$type_links['all'] = "<option value=''$selected>" . sprintf( _nx( 'All (%s)', 'All (%s)', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</option>'; $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 ) { foreach ( $post_mime_types as $mime_type => $label ) {
$class = '';
if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) ) if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
continue; continue;
@ -98,8 +96,10 @@ class WP_Media_List_Table extends WP_List_Table {
?> ?>
<div class="actions"> <div class="actions">
<?php <?php
if ( ! is_singular() && ! $this->is_trash ) { if ( ! is_singular() ) {
$this->months_dropdown( 'attachment' ); if ( ! $this->is_trash ) {
$this->months_dropdown( 'attachment' );
}
/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */ /** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
do_action( 'restrict_manage_posts' ); do_action( 'restrict_manage_posts' );