Don't notify your own comments, fixes #1670
git-svn-id: https://develop.svn.wordpress.org/trunk@3031 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
646a09ead4
commit
58b39edd36
|
@ -34,11 +34,15 @@ function wp_new_comment( $commentdata ) {
|
||||||
$commentdata = apply_filters('preprocess_comment', $commentdata);
|
$commentdata = apply_filters('preprocess_comment', $commentdata);
|
||||||
|
|
||||||
$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
|
$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
|
||||||
|
$commentdata['user_ID'] = (int) $commentdata['user_ID'];
|
||||||
|
|
||||||
$commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
|
$commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
|
||||||
$commentdata['comment_agent'] = $_SERVER['HTTP_USER_AGENT'];
|
$commentdata['comment_agent'] = $_SERVER['HTTP_USER_AGENT'];
|
||||||
$commentdata['comment_date'] = current_time('mysql');
|
|
||||||
|
$commentdata['comment_date'] = current_time('mysql');
|
||||||
$commentdata['comment_date_gmt'] = current_time('mysql', 1);
|
$commentdata['comment_date_gmt'] = current_time('mysql', 1);
|
||||||
|
|
||||||
|
|
||||||
$commentdata = wp_filter_comment($commentdata);
|
$commentdata = wp_filter_comment($commentdata);
|
||||||
|
|
||||||
$commentdata['comment_approved'] = wp_allow_comment($commentdata);
|
$commentdata['comment_approved'] = wp_allow_comment($commentdata);
|
||||||
|
@ -51,7 +55,9 @@ function wp_new_comment( $commentdata ) {
|
||||||
if ( '0' == $commentdata['comment_approved'] )
|
if ( '0' == $commentdata['comment_approved'] )
|
||||||
wp_notify_moderator($comment_ID);
|
wp_notify_moderator($comment_ID);
|
||||||
|
|
||||||
if ( get_settings('comments_notify') && $commentdata['comment_approved'] )
|
$post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
|
||||||
|
|
||||||
|
if ( get_settings('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
|
||||||
wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
|
wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,12 +85,12 @@ function wp_insert_comment($commentdata) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function wp_filter_comment($commentdata) {
|
function wp_filter_comment($commentdata) {
|
||||||
$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
|
$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
|
||||||
$commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', $commentdata['comment_agent']);
|
$commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', $commentdata['comment_agent']);
|
||||||
$commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
|
$commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
|
||||||
$commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
|
$commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
|
||||||
$commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
|
$commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
|
||||||
$commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
|
$commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
|
||||||
$commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
|
$commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
|
||||||
$commentdata['filtered'] = true;
|
$commentdata['filtered'] = true;
|
||||||
return $commentdata;
|
return $commentdata;
|
||||||
|
|
Loading…
Reference in New Issue