Ticket #39650: 39650.5.patch

wp-comments-post.php

@@ -28 +28 @@
         if ( ! empty( $data ) ) {
                 wp_die( '<p>' . $comment->get_error_message() . '</p>', __( 'Comment Submission Failure' ), array( 'response' => $data, 'back_link' => true ) );
         } else {
-                exit;
+                wp_die( '<p>' . $comment->get_error_message() . '</p>', __( 'Comment Submission Failure' ), array( 'back_link' => true ) );
         }
 }
 

wp-includes/comment.php

@@ -2956 +2956 @@
                  */
                 do_action( 'comment_id_not_found', $comment_post_ID );
 
-                return new WP_Error( 'comment_id_not_found' );
+                return new WP_Error( 'comment_id_not_found', __( 'Sorry, comments are not allowed for this item.' ), 403 );
 
         }
 
@@ -2964 +2964 @@
         $status = get_post_status( $post );
 
         if ( ( 'private' == $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
-                return new WP_Error( 'comment_id_not_found' );
+                return new WP_Error( 'comment_id_not_found', __( 'Sorry, comments are not allowed for this item.' ), 403 );
         }
 
         $status_obj = get_post_status_object( $status );
@@ -2993 +2993 @@
                  */
                 do_action( 'comment_on_trash', $comment_post_ID );
 
-                return new WP_Error( 'comment_on_trash' );
+                return new WP_Error( 'comment_on_trash', __( 'Sorry, comments are not allowed for this item.' ), 403 );
 
         } elseif ( ! $status_obj->public && ! $status_obj->private ) {
 
@@ -3006 +3006 @@
                  */
                 do_action( 'comment_on_draft', $comment_post_ID );
 
-                return new WP_Error( 'comment_on_draft' );
+                return new WP_Error( 'comment_on_draft', __( 'Sorry, comments are not allowed for this item.' ), 403 );
 
         } elseif ( post_password_required( $comment_post_ID ) ) {
 
@@ -3019 +3019 @@
                  */
                 do_action( 'comment_on_password_protected', $comment_post_ID );
 
-                return new WP_Error( 'comment_on_password_protected' );
+                return new WP_Error( 'comment_on_password_protected', __( 'Sorry, comments are not allowed for this item.' ), 403 );
 
         } else {