Ticket #39028: 39028.patch

src/wp-includes/comment.php

@@ -2961 +2961 @@
                  */
                 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, the item you try to comment on does not exist anymore.' ), 403 );
 
         }
 
@@ -2969 +2969 @@
         $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_on_private', __( 'Sorry, comments are not allowed for this item.' ), 403 );
         }
 
         $status_obj = get_post_status_object( $status );
@@ -2998 +2998 @@
                  */
                 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 ) {
 
@@ -3011 +3011 @@
                  */
                 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 ) ) {
 
@@ -3024 +3024 @@
                  */
                 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 {