WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't notify the author when they posted or moderated the comment. fixes #12774. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-11-11 16:28:49 +00:00
parent 3a4671f530
commit d974a35fb0
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-includes/pluggable.php
View File

@ -998,18 +998,22 @@ if ( ! function_exists('wp_notify_postauthor') ) :
* @param string $comment_type Optional. The comment type either 'comment' (default), 'trackback', or 'pingback' * @param string $comment_type Optional. The comment type either 'comment' (default), 'trackback', or 'pingback'
* @return bool False if user email does not exist. True on completion. * @return bool False if user email does not exist. True on completion.
*/ */
function wp_notify_postauthor($comment_id, $comment_type='') { function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
$comment = get_comment($comment_id); $comment = get_comment( $comment_id );
$post = get_post($comment->comment_post_ID); $post = get_post( $comment->comment_post_ID );
$user = get_userdata( $post->post_author ); $author = get_userdata( $post->post_author );
$moderating_user = wp_get_current_user();
$moderating_uid = (int) $user->id;
if ( $comment->user_id == $post->post_author ) return false; // The comment was left by the author. // The comment was left by the author
if ( $comment->user_id == $post->post_author )
return false;
if ( $user->user_id == $moderating_uid ) return false; // The author moderated a comment on his own post // The author moderated a comment on his own post
if ( $post->post_author == get_current_user_id() )
return false;
if ('' == $user->user_email) return false; // If there's no email to send the comment to // If there's no email to send the comment to
if ( '' == $author->user_email )
return false;
$comment_author_domain = @gethostbyaddr($comment->comment_author_IP); $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
@ -1079,7 +1083,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
$subject = apply_filters('comment_notification_subject', $subject, $comment_id); $subject = apply_filters('comment_notification_subject', $subject, $comment_id);
$message_headers = apply_filters('comment_notification_headers', $message_headers, $comment_id); $message_headers = apply_filters('comment_notification_headers', $message_headers, $comment_id);
@wp_mail($user->user_email, $subject, $notify_message, $message_headers); @wp_mail( $author->user_email, $subject, $notify_message, $message_headers );
return true; return true;
} }