From f74a907eacac65141c0e6a157ea7e2a32b38df63 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Thu, 13 Aug 2015 22:31:24 +0000
Subject: [PATCH] Capabilities: Fall back to the `edit_posts` capability for
 orphaned comments.

Also avoid PHP notices because of orphaned comments in the comments list table.
Includes unit test.

props pento, dd32.
fixes #33154.
Built from https://develop.svn.wordpress.org/trunk@33614


git-svn-id: http://core.svn.wordpress.org/trunk@33581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-comments-list-table.php | 10 ++++++----
 wp-includes/capabilities.php                       | 11 ++++++++++-
 wp-includes/version.php                            |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 3578c8d93d..fcfcd1e36b 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -472,8 +472,6 @@ class WP_Comments_List_Table extends WP_List_Table {
  			return;
 		}
 
-		$post = get_post();
-
 		$the_comment_status = wp_get_comment_status( $comment->comment_ID );
 
 		$out = '';
@@ -534,9 +532,9 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 			$format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" title="%s" href="#">%s</a>';
 
-			$actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline',esc_attr__( 'Edit this item inline' ), __( 'Quick&nbsp;Edit' ) );
+			$actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline',esc_attr__( 'Edit this item inline' ), __( 'Quick&nbsp;Edit' ) );
 
-			$actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
+			$actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
 		}
 
 		/** This filter is documented in wp-admin/includes/dashboard.php */
@@ -672,6 +670,10 @@ class WP_Comments_List_Table extends WP_List_Table {
 	public function column_response() {
 		$post = get_post();
 
+		if ( ! $post ) {
+			return;
+		}
+
 		if ( isset( $this->pending_count[$post->ID] ) ) {
 			$pending_comments = $this->pending_count[$post->ID];
 		} else {
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index dd97d98098..42133f6feb 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1305,7 +1305,16 @@ function map_meta_cap( $cap, $user_id ) {
 		if ( empty( $comment ) )
 			break;
 		$post = get_post( $comment->comment_post_ID );
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+
+		/*
+		 * If the post doesn't exist, we have an orphaned comment.
+		 * Fall back to the edit_posts capability, instead.
+		 */
+		if ( $post ) {
+			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		} else {
+			$caps = map_meta_cap( 'edit_posts', $user_id );
+		}
 		break;
 	case 'unfiltered_upload':
 		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 671b2badcb..144ef0f349 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-RC2-33613';
+$wp_version = '4.3-RC2-33614';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.