<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16304] trunk/wp-includes/pluggable.php: Don'
t notify the author when they posted or moderated the comment.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16304">16304</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-11 16:28:49 +0000 (Thu, 11 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't notify the author when they posted or moderated the comment. fixes <a href="http://trac.wordpress.org/ticket/12774">#12774</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (16303 => 16304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-11-11 16:22:18 UTC (rev 16303)
+++ trunk/wp-includes/pluggable.php 2010-11-11 16:28:49 UTC (rev 16304)
</span><span class="lines">@@ -998,18 +998,22 @@
</span><span class="cx"> * @param string $comment_type Optional. The comment type either 'comment' (default), 'trackback', or 'pingback'
</span><span class="cx"> * @return bool False if user email does not exist. True on completion.
</span><span class="cx"> */
</span><del>-function wp_notify_postauthor($comment_id, $comment_type='') {
- $comment = get_comment($comment_id);
- $post = get_post($comment->comment_post_ID);
- $user = get_userdata( $post->post_author );
- $moderating_user = wp_get_current_user();
- $moderating_uid = (int) $user->id;
</del><ins>+function wp_notify_postauthor( $comment_id, $comment_type = '' ) {
+ $comment = get_comment( $comment_id );
+ $post = get_post( $comment->comment_post_ID );
+ $author = get_userdata( $post->post_author );
</ins><span class="cx">
</span><del>- if ( $comment->user_id == $post->post_author ) return false; // The comment was left by the author.
</del><ins>+ // The comment was left by the author
+ if ( $comment->user_id == $post->post_author )
+ return false;
</ins><span class="cx">
</span><del>- if ( $user->user_id == $moderating_uid ) return false; // The author moderated a comment on his own post
</del><ins>+ // The author moderated a comment on his own post
+ if ( $post->post_author == get_current_user_id() )
+ return false;
</ins><span class="cx">
</span><del>- if ('' == $user->user_email) return false; // If there's no email to send the comment to
</del><ins>+ // If there's no email to send the comment to
+ if ( '' == $author->user_email )
+ return false;
</ins><span class="cx">
</span><span class="cx"> $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
</span><span class="cx">
</span><span class="lines">@@ -1079,7 +1083,7 @@
</span><span class="cx"> $subject = apply_filters('comment_notification_subject', $subject, $comment_id);
</span><span class="cx"> $message_headers = apply_filters('comment_notification_headers', $message_headers, $comment_id);
</span><span class="cx">
</span><del>- @wp_mail($user->user_email, $subject, $notify_message, $message_headers);
</del><ins>+ @wp_mail( $author->user_email, $subject, $notify_message, $message_headers );
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>