From 27558ed678ea4b2617a70c3aaf93396f8fd65392 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Fri, 25 Sep 2015 14:42:48 +0000 Subject: [PATCH] Improve status checks when sending comment post author notification. [34537] hooked `wp_new_comment_notify_postauthor()` to the 'wp_set_comment_status' when a comment had been approved. When performing multiple actions on a comment in the same request (as happens in `Tests_Ajax_DeleteComment::test_ajax_trash_double_action()`, and may happen sometimes in real life too), and when one of those actions involves deleting the comment, the `$comment_ID` passed to `wp_new_comment_notify_postauthor()` can correspond to an already-deleted comment. The `comment_status` check should account for this possibility. See #14078. git-svn-id: https://develop.svn.wordpress.org/trunk@34545 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/comment-functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/comment-functions.php b/src/wp-includes/comment-functions.php index 2c399e7c43..949453e159 100644 --- a/src/wp-includes/comment-functions.php +++ b/src/wp-includes/comment-functions.php @@ -1737,7 +1737,7 @@ function wp_new_comment_notify_postauthor( $comment_ID ) { } // Only send notifications for approved comments. - if ( 'spam' === $comment->comment_approved || ! $comment->comment_approved ) { + if ( ! isset( $comment->comment_approved ) || 'spam' === $comment->comment_approved || ! $comment->comment_approved ) { return false; }