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

Media: show Trash filter for Media list table when `MEDIA_TRASH` is true. 

Props chacha102.
Fixes #34795.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-12-01 20:48:25 +00:00
parent cd9515d306
commit d569b9609e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ class WP_Media_List_Table extends WP_List_Table {
}
$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
if ( $this->is_trash ) {
if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
$type_links['trash'] = sprintf(
'<option value="trash"%s>%s</option>',
selected( 'trash' === $filter, true, false ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-RC1-35751';
$wp_version = '4.4-RC1-35752';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.