Changeset 34106

Timestamp:

09/14/2015 02:16:02 AM (9 years ago)

Author:

boonebgorges

Message:

Send comment notification emails via a hooked function.

Previously, wp_notify_postauthor() and wp_notify_moderator() were called
directly from wp_new_comment(), making it difficult to modify or suppress
default notification emails.

Props dshanske, thomaswm.
See #33587.

Location:

trunk/src/wp-includes

Files:

• comment-functions.php (modified) (1 diff)
• default-filters.php (modified) (1 diff)

trunk/src/wp-includes/comment-functions.php

@@ -1630 +1630 @@
     do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'] );
 
-    if ( 'spam' !== $commentdata['comment_approved'] ) { // If it's spam save it silently for later crunching
-        if ( '0' == $commentdata['comment_approved'] ) {
-            wp_notify_moderator( $comment_ID );
-        }
-
-        // wp_notify_postauthor() checks if notifying the author of their own comment.
-        // By default, it won't, but filters can override this.
-        if ( get_option( 'comments_notify' ) && $commentdata['comment_approved'] ) {
-            wp_notify_postauthor( $comment_ID );
-        }
-    }
-
     return $comment_ID;
+}
+
+/**
+ * Send a comment moderation notification to the comment moderator.
+ *
+ * @since 4.4.0
+ *
+ * @param int $comment_ID       ID of the comment.
+ * @param int $comment_approved Whether the comment is approved.
+ */
+function wp_new_comment_notify_moderator( $comment_ID, $comment_approved ) {
+    if ( '0' == $comment_approved ) {
+        wp_notify_moderator( $comment_ID );
+    }
+}
+
+/**
+ * Send a notification of a new comment to the post author.
+ *
+ * @since 4.4.0
+ *
+ * @param int $comment_ID ID of the comment.
+ */
+function wp_new_comment_notify_postauthor( $comment_ID ) {
+    $comment = get_comment( $comment_ID );
+
+    /*
+     * `wp_notify_postauthor()` checks if notifying the author of their own comment.
+     * By default, it won't, but filters can override this.
+     */
+    if ( get_option( 'comments_notify' ) && $comment->comment_approved ) {
+        wp_notify_postauthor( $comment_ID );
+    }
 }
 

trunk/src/wp-includes/default-filters.php

@@ -335 +335 @@
 add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
 
+// Email notifications.
+add_action( 'comment_post', 'wp_new_comment_notify_moderator', 10, 2 );
+add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
+
 /**
  * Filters formerly mixed into wp-includes