Changeset 25104

Timestamp:

08/23/2013 07:35:04 PM (12 years ago)

Author:

nacin

Message:

Add filters to the recipients of emails sent by wp_notify_postauthor() and wp_notify_moderator().

The new filters are called comment_notification_recipients and comment_moderation_recipients.

Add the context of $comment_id to the comment_moderation_headers filter, to match the comment_notification_headers filter.

props chipbennett.
fixes #22922, #20353.

File:

• trunk/src/wp-includes/pluggable.php (modified) (3 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1075 +1075 @@
         $message_headers .= $reply_to . "\n";
 
-    $notify_message = apply_filters('comment_notification_text', $notify_message, $comment_id);
-    $subject = apply_filters('comment_notification_subject', $subject, $comment_id);
-    $message_headers = apply_filters('comment_notification_headers', $message_headers, $comment_id);
-
-    @wp_mail( $author->user_email, $subject, $notify_message, $message_headers );
+    $emails = array( $author->user_email );
+
+    $emails          = apply_filters( 'comment_notification_recipients', $emails,          $comment_id );
+    $notify_message  = apply_filters( 'comment_notification_text',       $notify_message,  $comment_id );
+    $subject         = apply_filters( 'comment_notification_subject',    $subject,         $comment_id );
+    $message_headers = apply_filters( 'comment_notification_headers',    $message_headers, $comment_id );
+
+    foreach ( $emails as $email ) {
+        @wp_mail( $emails, $subject, $notify_message, $message_headers );
+    }
 
     return true;
@@ -1105 +1110 @@
     $user = get_userdata( $post->post_author );
     // Send to the administration and to the post author if the author can modify the comment.
-    $email_to = array( get_option('admin_email') );
+    $emails = array( get_option('admin_email') );
     if ( user_can($user->ID, 'edit_comment', $comment_id) && !empty($user->user_email) && ( get_option('admin_email') != $user->user_email) )
-        $email_to[] = $user->user_email;
+        $emails[] = $user->user_email;
 
     $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
@@ -1157 +1162 @@
     $message_headers = '';
 
-    $notify_message = apply_filters('comment_moderation_text', $notify_message, $comment_id);
-    $subject = apply_filters('comment_moderation_subject', $subject, $comment_id);
-    $message_headers = apply_filters('comment_moderation_headers', $message_headers);
-
-    foreach ( $email_to as $email )
-        @wp_mail($email, $subject, $notify_message, $message_headers);
+    $emails          = apply_filters( 'comment_moderation_recipients', $emails,          $comment_id );
+    $notify_message  = apply_filters( 'comment_moderation_text',       $notify_message,  $comment_id );
+    $subject         = apply_filters( 'comment_moderation_subject',    $subject,         $comment_id );
+    $message_headers = apply_filters( 'comment_moderation_headers',    $message_headers, $comment_id );
+
+    foreach ( $emails as $email ) {
+        @wp_mail( $email, $subject, $notify_message, $message_headers );
+    }
 
     return true;