Changeset 40128

Timestamp:

02/27/2017 12:22:02 AM (8 years ago)

Author:

johnbillion

Message:

Comments: When commenting on a draft post, display a friendly error message if the user can view the post.

This prevents the unhelpful white screen of death when a user who can view the post (eg. preview it) leaves a comment while the post is in draft.

Props sagarprajapati, milindmore22, mayurk, swissspidy
Fixes #39650

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (1 diff)
• tests/phpunit/tests/comment-submission.php (modified) (2 diffs)

trunk/src/wp-includes/comment.php

@@ -3006 +3006 @@
          */
         do_action( 'comment_on_draft', $comment_post_ID );
-
-        return new WP_Error( 'comment_on_draft' );
+        
+        if ( current_user_can( 'read_post', $comment_post_ID ) ) {
+            return new WP_Error( 'comment_on_draft', __( 'Sorry, comments are not allowed for this item.' ), 403 );
+        } else {
+            return new WP_Error( 'comment_on_draft' );
+        }
 
     } elseif ( post_password_required( $comment_post_ID ) ) {

trunk/tests/phpunit/tests/comment-submission.php

@@ -69 +69 @@
 
     public function test_submitting_comment_to_draft_post_returns_error() {
-
         $error = 'comment_on_draft';
 
@@ -85 +84 @@
         $this->assertWPError( $comment );
         $this->assertSame( $error, $comment->get_error_code() );
-
+        $this->assertEmpty( $comment->get_error_message() );
+
+    }
+
+    /**
+     * @ticket 39650
+     */
+    public function test_submitting_comment_to_draft_post_returns_error_message_for_user_with_correct_caps() {
+        $error = 'comment_on_draft';
+
+        $user = self::factory()->user->create_and_get( array(
+            'role' => 'author',
+        ) );
+
+        wp_set_current_user( $user->ID );
+
+        $this->assertSame( 0, did_action( $error ) );
+
+        $post = self::factory()->post->create_and_get( array(
+            'post_status' => 'draft',
+            'post_author' => $user->ID,
+        ) );
+        $data = array(
+            'comment_post_ID' => $post->ID,
+        );
+        $comment = wp_handle_comment_submission( $data );
+
+        $this->assertSame( 1, did_action( $error ) );
+        $this->assertWPError( $comment );
+        $this->assertSame( $error, $comment->get_error_code() );
+        $this->assertNotEmpty( $comment->get_error_message() );
     }