Ticket #33587: 33587.diff

comment-functions.php

@@ -2407 +2407 @@
 
         return $open;
 }
+
+/**
+ * Generates a text summary for a comment to be used in notification messages.
+ *                                                                              
+ * @access public
+ * @since trunk
+ *
+ * @param int $comment_id Comment ID
+ * @return string $notify_message
+ */
+function get_comment_notify_summary( $comment_id ) {
+        $comment = get_comment($comment_id);
+        $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
+        switch ( $comment->comment_type ) {
+                case 'trackback':
+                        /* translators: 1: website name, 2: website IP, 3: website hostname */
+                        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+                        $notify_message .= sprintf( __( 'Trackback Excerpt: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
+                        break;
+                case 'pingback':
+                        /* translators: 1: website name, 2: website IP, 3: website hostname */
+                        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+                        $notify_message .= sprintf( __( 'Pingback Excerpt: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
+                        break;
+                        default: // Comments
+                                /* translators: 1: comment author, 2: author IP, 3: author domain */
+                                $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                                $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
+                                $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+                                $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
+                                break;
+                }
+    /**
+     * Filter the result, allowing for custom comment types and/or custom presentation.
+     *
+     * @since 
+     *
+     * @param string $notify_message Text of the Summary Message.
+     * @param int $comment_id Comment ID.
+     */
+                return apply_filters( 'comment_notify_summary', $notify_message, $comment_id );
+}
+
+/**
+ * Notifies a moderator that a new comment is available
+ *
+ * @access public
+ * @since trunk
+ *
+ * @param int $comment_id Comment ID
+ */
+function wp_email_moderator( $comment_id ) {
+        global $wpdb;
+        $comment = get_comment($comment_id);
+        $post = get_post($comment->comment_post_ID);
+        $user = get_userdata( $post->post_author );
+        // Send to the administration and to the post author if the author can modify the comment.
+        $emails = array( get_option( 'admin_email' ) );
+        if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
+                if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
+                        $emails[] = $user->user_email;
+        }
+        $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
+        $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
+ 
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // we want to reverse this for the plain text arena of emails.
+        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+        $summary = get_comment_notify_summary ($comment_id); 
+
+        // Generate the Moderation Links.
+  $moderation = sprintf( __('Approve it: %s'),  admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n";
+        if ( EMPTY_TRASH_DAYS )
+                $moderation .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+        else
+                $moderation .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
+        $moderation .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+ 
+        $moderation .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
+                'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
+        $moderation .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
+        /**
+         * Filter the comment moderation email links.
+         *
+         * @since 
+         *
+         * @param string $moderation Text of the comment moderation email links.
+         * @param int    $comment_id     Comment ID.
+         */
+        $moderation = apply_filters( 'comment_notify_moderator_links', $moderation, $comment_id );
+
+        /**
+         * Filter the list of recipients for comment moderation emails.
+         *
+         * @since 3.7.0
+         *
+         * @param array $emails     List of email addresses to notify for comment moderation.
+         * @param int   $comment_id Comment ID.
+         */
+        $emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
+
+
+        // Set up an Optional Header and a Footer for the Emails
+        $header = '';
+        $footer = '';
+
+  /**
+  * Filter the email header.
+  *
+  * @since 
+  *
+  * @param string $header Text of the header for the email.
+  */
+        $header = apply_filters( 'email_notify_header', $header );
+
+  /**
+  * Filter the email footer.
+  *
+  * @since 
+  *
+  * @param string $footer Text of the footer for the email.
+  */
+  $footer = apply_filters( 'email_notify_footer', $footer );
+
+
+        // Put together the pieces of the message.
+        $notify_message = $header . $summary . $moderation . $footer;
+
+        /**
+        * Filter the comment moderation email text.
+        *
+        * @since 1.5.2
+        *
+        * @param string $notify_message Text of the comment moderation email.
+        * @param int    $comment_id     Comment ID.
+        */
+        $notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
+
+
+        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
+
+        /**
+         * Filter the comment moderation email subject.
+         *
+         * @since 1.5.2
+         *
+         * @param string $subject    Subject of the comment moderation email.
+         * @param int    $comment_id Comment ID.
+         */
+        $subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
+
+        /**
+         * Filter the comment moderation email headers.
+         *
+         * @since 2.8.0
+         *
+         * @param string $message_headers Headers for the comment moderation email.
+         * @param int    $comment_id      Comment ID.
+         */
+        $message_headers = apply_filters( 'comment_moderation_headers', $message_headers, $comment_id );
+        
+
+        foreach ( $emails as $email ) {
+                @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+        }
+}
+
+add_action ( 'wp_notify_moderator', 'wp_email_moderator', 10, 1);
+
+/**
+ * Notifies a post author that a new comment is available
+ *
+ * @access public
+ * @since trunk
+ *
+ * @param int $comment_id Comment ID
+ */
+function wp_email_postauthor( $comment_id ) {
+        $post    = get_post( $comment->comment_post_ID );
+        $author  = get_userdata( $post->post_author );
+
+        // Who to notify? By default, just the post author, but others can be added.
+        $emails = array();
+        if ( $author ) {
+                $emails[] = $author->user_email;
+        }
+ 
+        /**
+         * Filter the list of email addresses to receive a comment notification.
+         *
+         * By default, only post authors are notified of comments. This filter allows
+         * others to be added.
+         *
+         * @since 3.7.0
+         *
+         * @param array $emails     An array of email addresses to receive a comment notification.
+         * @param int   $comment_id The comment ID.
+         */
+         $emails = apply_filters( 'comment_notification_recipients', $emails, $comment_id );
+         $emails = array_filter( $emails );
+ 
+        // If there are no addresses to send the comment to, bail.
+        if ( ! count( $emails ) ) {
+                return false;
+        }
+        // Facilitate unsetting below without knowing the keys.
+        $emails = array_flip( $emails );
+ 
+        /**
+         * Filter whether to notify comment authors of their comments on their own posts.
+         *
+         * By default, comment authors aren't notified of their comments on their own
+         * posts. This filter allows you to override that.
+         *
+         * @since 3.8.0
+         *
+         * @param bool $notify     Whether to notify the post author of their own comment.
+         *                         Default false.
+         * @param int  $comment_id The comment ID.
+         */
+        $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id );
+        // The comment was left by the author
+        if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
+                        unset( $emails[ $author->user_email ] );
+        }
+ 
+        // The author moderated a comment on their own post
+        if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
+                unset( $emails[ $author->user_email ] );
+        }
+ 
+        // The post author is no longer a member of the blog
+        if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
+                unset( $emails[ $author->user_email ] );
+        }
+ 
+        // If there's no email to send the comment to, bail, otherwise flip array back around for use below
+        if ( ! count( $emails ) ) {
+                return false;
+        } else {
+                $emails = array_flip( $emails );
+        }
+
+        $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
+ 
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // we want to reverse this for the plain text arena of emails.
+        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+        $summary = get_comment_notify_summary( $comment_id );
+
+        $moderation = get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
+        $moderation .= sprintf( __('Permalink: %s'), get_comment_link( $comment_id ) ) . "\r\n";
+ 
+        if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {
+                if ( EMPTY_TRASH_DAYS )
+                        $moderation .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+                else
+                        $moderation .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
+                        $moderation .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+        }
+  /**
+   * Filter the comment moderation email links.
+   *
+   * @since 
+   *
+   * @param string $moderation Text of the comment moderation email links.
+   * @param int    $comment_id     Comment ID.
+   */
+  $moderation = apply_filters( 'comment_notify_postauthor_links', $moderation, $comment_id );
+
+        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
+ 
+        if ( '' == $comment->comment_author ) {
+                $from = "From: \"$blogname\" <$wp_email>";
+                if ( '' != $comment->comment_author_email )
+                        $reply_to = "Reply-To: $comment->comment_author_email";
+                } else {
+                        $from = "From: \"$comment->comment_author\" <$wp_email>";
+                if ( '' != $comment->comment_author_email )
+                        $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+                }
+ 
+        $message_headers = "$from\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+        if ( isset($reply_to) )
+                $message_headers .= $reply_to . "\n";
+
+        // Set up an Optional Header and a Footer for the Emails
+        $header = '';
+        $footer = '';
+
+        /**
+         * Filter the email header.
+         *
+         * @since 
+         *
+         * @param string $header Text of the header for the email.
+         */
+        $header = apply_filters( 'email_notify_header', $header );
+
+        /**
+         * Filter the email footer.
+         *
+         * @since 
+         *
+         * @param string $footer Text of the footer for the email.
+         */
+        $footer = apply_filters( 'email_notify_footer', $footer );
+
+
+  // Put together the pieces of the message.
+  $notify_message = $header . $summary . $moderation . $footer;
+
+        /**
+         * Filter the comment notification email text.
+         *
+         * @since 1.5.2
+         *
+         * @param string $notify_message The comment notification email text.
+         * @param int    $comment_id     Comment ID.
+         */
+        $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment_id );
+ 
+        /**
+         * Filter the comment notification email subject.
+         *
+         * @since 1.5.2
+         *
+         * @param string $subject    The comment notification email subject.
+         * @param int    $comment_id Comment ID.
+         */
+         $subject = apply_filters( 'comment_notification_subject', $subject, $comment_id );
+ 
+        /**
+         * Filter the comment notification email headers.
+         *
+         * @since 1.5.2
+         *
+         * @param string $message_headers Headers for the comment notification email.
+         * @param int    $comment_id      Comment ID.
+         */
+        $message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment_id );
+ 
+        foreach ( $emails as $email ) {
+         @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+        }
+ 
+        return true;
+}
+
+add_action ( 'wp_notify_postauthor', 'wp_email_postauthor', 10, 1);
+
+

pluggable.php

@@ -1365 +1365 @@
         if ( empty( $comment ) )
                 return false;
 
-        $post    = get_post( $comment->comment_post_ID );
-        $author  = get_userdata( $post->post_author );
-
-        // Who to notify? By default, just the post author, but others can be added.
-        $emails = array();
-        if ( $author ) {
-                $emails[] = $author->user_email;
-        }
-
         /**
-         * Filter the list of email addresses to receive a comment notification.
+         * Hook to add functions that notify the post author.
          *
-         * By default, only post authors are notified of comments. This filter allows
-         * others to be added.
+         * @since 
          *
-         * @since 3.7.0
-         *
-         * @param array $emails     An array of email addresses to receive a comment notification.
-         * @param int   $comment_id The comment ID.
+         * @param int   $comment_id Comment ID.
          */
-        $emails = apply_filters( 'comment_notification_recipients', $emails, $comment_id );
-        $emails = array_filter( $emails );
-
-        // If there are no addresses to send the comment to, bail.
-        if ( ! count( $emails ) ) {
-                return false;
-        }
-
-        // Facilitate unsetting below without knowing the keys.
-        $emails = array_flip( $emails );
-
-        /**
-         * Filter whether to notify comment authors of their comments on their own posts.
-         *
-         * By default, comment authors aren't notified of their comments on their own
-         * posts. This filter allows you to override that.
-         *
-         * @since 3.8.0
-         *
-         * @param bool $notify     Whether to notify the post author of their own comment.
-         *                         Default false.
-         * @param int  $comment_id The comment ID.
-         */
-        $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id );
-
-        // The comment was left by the author
-        if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
-                unset( $emails[ $author->user_email ] );
-        }
-
-        // The author moderated a comment on their own post
-        if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
-                unset( $emails[ $author->user_email ] );
-        }
-
-        // The post author is no longer a member of the blog
-        if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
-                unset( $emails[ $author->user_email ] );
-        }
-
-        // If there's no email to send the comment to, bail, otherwise flip array back around for use below
-        if ( ! count( $emails ) ) {
-                return false;
-        } else {
-                $emails = array_flip( $emails );
-        }
-
-        $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
-
-        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-        // we want to reverse this for the plain text arena of emails.
-        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
-        switch ( $comment->comment_type ) {
-                case 'trackback':
-                        $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-                        $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
-                        $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
-                        /* translators: 1: blog name, 2: post title */
-                        $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
-                        break;
-                case 'pingback':
-                        $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-                        $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
-                        $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
-                        /* translators: 1: blog name, 2: post title */
-                        $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
-                        break;
-                default: // Comments
-                        $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
-                        /* translators: 1: comment author, 2: author IP, 3: author domain */
-                        $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
-                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-                        $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
-                        $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
-                        /* translators: 1: blog name, 2: post title */
-                        $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
-                        break;
-        }
-        $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-        $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment_id ) ) . "\r\n";
-
-        if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {
-                if ( EMPTY_TRASH_DAYS )
-                        $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
-                else
-                        $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-                $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
-        }
-
-        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
-
-        if ( '' == $comment->comment_author ) {
-                $from = "From: \"$blogname\" <$wp_email>";
-                if ( '' != $comment->comment_author_email )
-                        $reply_to = "Reply-To: $comment->comment_author_email";
-        } else {
-                $from = "From: \"$comment->comment_author\" <$wp_email>";
-                if ( '' != $comment->comment_author_email )
-                        $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
-        }
-
-        $message_headers = "$from\n"
-                . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-
-        if ( isset($reply_to) )
-                $message_headers .= $reply_to . "\n";
-
-        /**
-         * Filter the comment notification email text.
-         *
-         * @since 1.5.2
-         *
-         * @param string $notify_message The comment notification email text.
-         * @param int    $comment_id     Comment ID.
-         */
-        $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment_id );
-
-        /**
-         * Filter the comment notification email subject.
-         *
-         * @since 1.5.2
-         *
-         * @param string $subject    The comment notification email subject.
-         * @param int    $comment_id Comment ID.
-         */
-        $subject = apply_filters( 'comment_notification_subject', $subject, $comment_id );
-
-        /**
-         * Filter the comment notification email headers.
-         *
-         * @since 1.5.2
-         *
-         * @param string $message_headers Headers for the comment notification email.
-         * @param int    $comment_id      Comment ID.
-         */
-        $message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment_id );
-
-        foreach ( $emails as $email ) {
-                @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
-        }
-
+        do_action( 'wp_notify_postauthor', $comment_id );
         return true;
 }
 endif;
@@ -1550 +1389 @@
  * @return true Always returns true
  */
 function wp_notify_moderator($comment_id) {
-        global $wpdb;
-
         if ( 0 == get_option( 'moderation_notify' ) )
                 return true;
 
-        $comment = get_comment($comment_id);
-        $post = get_post($comment->comment_post_ID);
-        $user = get_userdata( $post->post_author );
-        // Send to the administration and to the post author if the author can modify the comment.
-        $emails = array( get_option( 'admin_email' ) );
-        if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-                if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
-                        $emails[] = $user->user_email;
-        }
-
-        $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
-        $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
-
-        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-        // we want to reverse this for the plain text arena of emails.
-        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
-        switch ( $comment->comment_type ) {
-                case 'trackback':
-                        $notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-                        /* translators: 1: website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-                        $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
-                        break;
-                case 'pingback':
-                        $notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-                        /* translators: 1: website name, 2: website IP, 3: website hostname */
-                        $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-                        $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
-                        break;
-                default: // Comments
-                        $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-                        $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
-                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-                        $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
-                        break;
-        }
-
-        $notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n";
-        if ( EMPTY_TRASH_DAYS )
-                $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
-        else
-                $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-        $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
-
-        $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
-                'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
-        $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
-
-        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
-        $message_headers = '';
-
         /**
-         * Filter the list of recipients for comment moderation emails.
+         * Hook to add functions that notify the moderator.
          *
-         * @since 3.7.0
+         * @since
          *
-         * @param array $emails     List of email addresses to notify for comment moderation.
          * @param int   $comment_id Comment ID.
          */
-        $emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
-
-        /**
-         * Filter the comment moderation email text.
-         *
-         * @since 1.5.2
-         *
-         * @param string $notify_message Text of the comment moderation email.
-         * @param int    $comment_id     Comment ID.
-         */
-        $notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
-
-        /**
-         * Filter the comment moderation email subject.
-         *
-         * @since 1.5.2
-         *
-         * @param string $subject    Subject of the comment moderation email.
-         * @param int    $comment_id Comment ID.
-         */
-        $subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
-
-        /**
-         * Filter the comment moderation email headers.
-         *
-         * @since 2.8.0
-         *
-         * @param string $message_headers Headers for the comment moderation email.
-         * @param int    $comment_id      Comment ID.
-         */
-        $message_headers = apply_filters( 'comment_moderation_headers', $message_headers, $comment_id );
-
-        foreach ( $emails as $email ) {
-                @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
-        }
-
+        do_action( 'wp_notify_moderator', $comment_id );
         return true;
 }
 endif;