Ticket #35006: 35006.2.diff

src/wp-includes/comment.php

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

tests/phpunit/tests/comment.php

@@ -293 +293 @@
                 $this->assertTrue( wp_notify_moderator( $c ) );
         }
 
+        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
          */
@@ -307 +326 @@
         }
 
         /**
+         * @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',
+                ) );
+
+                $sent = wp_new_comment_notify_postauthor( $c );
+                $this->assertFalse( $sent );
+        }
+
+        /**
          * @ticket 12431
          */
         public function test_wp_new_comment_with_meta() {