From 4f151b577e64f94395eac7d28d0f9ae28c66d58b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 10 Feb 2020 04:57:06 +0000 Subject: [PATCH] Administration: Standardize "found in Trash" messages. Props Presskopp, audrasjb. Fixes #38669. Built from https://develop.svn.wordpress.org/trunk@47234 git-svn-id: http://core.svn.wordpress.org/trunk@47034 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-comments-list-table.php | 2 ++ wp-admin/includes/class-wp-media-list-table.php | 6 +++++- wp-includes/version.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php index f3e1fdf3aa..91ff88ec8d 100644 --- a/wp-admin/includes/class-wp-comments-list-table.php +++ b/wp-admin/includes/class-wp-comments-list-table.php @@ -200,6 +200,8 @@ class WP_Comments_List_Table extends WP_List_Table { if ( 'moderated' === $comment_status ) { _e( 'No comments awaiting moderation.' ); + } elseif ( 'trash' === $comment_status ) { + _e( 'No comments found in Trash.' ); } else { _e( 'No comments found.' ); } diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index f233f745ad..cc8940a6cb 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -222,7 +222,11 @@ class WP_Media_List_Table extends WP_List_Table { /** */ public function no_items() { - _e( 'No media files found.' ); + if ( $this->is_trash ) { + _e( 'No media files found in Trash.' ); + } else { + _e( 'No media files found.' ); + } } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 7013f47974..f3c3ba0718 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-47233'; +$wp_version = '5.4-alpha-47234'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.