Changeset 36119 for trunk

Timestamp:

12/29/2015 05:53:23 PM (11 years ago)

Author:

jorbin

Message:

Ensure only approved comments trigger post author notifications

Posts that are trashed shouldn't trigger post author notifications. Adds unit tests to enforce this.

Props scottbrownconsulting, peterwilsoncc, swissspidy
Fixes #35006

Location:

trunk

Files:

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

trunk/src/wp-includes/comment.php

@@ -1803 +1803 @@
 
         // 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;
         }

trunk/tests/phpunit/tests/comment.php

@@ -294 +294 @@
         }
 
+        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
@@ -301 +320 @@
                         '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',
                 ) );