Changeset 36146

Timestamp:

01/02/2016 03:34:35 AM (9 years ago)

Author:

dd32

Message:

Comments: Ensure only approved comments trigger post author notifications
Posts that are trashed shouldn't trigger post author notifications. Adds unit tests to enforce this.

Merges [36119] to the 4.4 branch.
Props scottbrownconsulting, peterwilsoncc, swissspidy.
Fixes #35006.

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/comment.php

@@ -1806 +1806 @@
 
     // Only send notifications for approved comments.
-    if ( ! isset( $comment->comment_approved ) || 'spam' === $comment->comment_approved || ! $comment->comment_approved ) {
+    if ( ! isset( $comment->comment_approved ) || '1' != $comment->comment_approved ) {
         return false;
     }

branches/4.4/tests/phpunit/tests/comment.php

@@ -279 +279 @@
     }
 
+    public function test_wp_new_comment_notify_postauthor_should_send_email_when_comment_is_approved() {
+        $c = self::factory()->comment->create( array(
+            'comment_post_ID' => self::$post_id,
+        ) );
+
+        $sent = wp_new_comment_notify_postauthor( $c );
+        $this->assertTrue( $sent );
+    }
+
+    public function test_wp_new_comment_notify_postauthor_should_not_send_email_when_comment_is_unapproved() {
+        $c = self::factory()->comment->create( array(
+            'comment_post_ID' => self::$post_id,
+            'comment_approved' => '0',
+        ) );
+
+        $sent = wp_new_comment_notify_postauthor( $c );
+        $this->assertFalse( $sent );
+    }
+
     /**
      * @ticket 33587
@@ -286 +305 @@
             'comment_post_ID' => self::$post_id,
             'comment_approved' => 'spam',
+        ) );
+
+        $sent = wp_new_comment_notify_postauthor( $c );
+        $this->assertFalse( $sent );
+    }
+
+    /**
+     * @ticket 35006
+     */
+    public function test_wp_new_comment_notify_postauthor_should_not_send_email_when_comment_has_been_trashed() {
+        $c = self::factory()->comment->create( array(
+            'comment_post_ID' => self::$post_id,
+            'comment_approved' => 'trash',
         ) );