Merge remote-tracking branch 'upstream/trunk' into rename-module-functions-to-script-modules

Author: dmsnell

Gruntfile.js

@@ -1033,6 +1033,7 @@ module.exports = function(grunt) {
 				cwd: SOURCE_DIR,
 				src: [
 					'wp-{admin,includes}/images/**/*.{png,jpg,gif,jpeg}',
+					'wp-content/themes/**/*.{png,jpg,gif,jpeg}',
 					'wp-includes/js/tinymce/skins/wordpress/images/*.{png,jpg,gif,jpeg}'
 				],
 				dest: SOURCE_DIR

src/wp-admin/css/list-tables.css

@@ -2143,6 +2143,11 @@ div.action-links,
 		padding: 10px 9px; /* reset from other list tables that have a label at this width */
 	}
 
+	#wpbody-content .wp-list-table.plugins .plugin-deleted-tr td,
+	#wpbody-content .wp-list-table.plugins .no-items td {
+		display: table-cell;
+	}
+
 	/* Plugin description hidden via Screen Options */
 	#wpbody-content .wp-list-table.plugins .desc.hidden {
 		display: none;

src/wp-admin/images/bubble_bg-2x.gif

@@ -648,7 +648,7 @@ public function single_row( $item ) {
 		$edit_post_cap = $post ? 'edit_post' : 'edit_posts';
 
 		if ( ! current_user_can( $edit_post_cap, $comment->comment_post_ID )
-			&& ( ! empty( $post->post_password )
+			&& ( post_password_required( $comment->comment_post_ID )
 				|| ! current_user_can( 'read_post', $comment->comment_post_ID ) )
 		) {
 			// The user has no access to the post and thus cannot see the comments.