Changeset 3031

Timestamp:

11/10/2005 11:31:58 PM (19 years ago)

Author:

matt

Message:

Don't notify your own comments, fixes #1670

File:

• trunk/wp-includes/comment-functions.php (modified) (3 diffs)

trunk/wp-includes/comment-functions.php

@@ -35 +35 @@
 
     $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_agent'] = $_SERVER['HTTP_USER_AGENT'];
-    $commentdata['comment_date'] = current_time('mysql');
+    $commentdata['comment_agent']     = $_SERVER['HTTP_USER_AGENT'];
+
+    $commentdata['comment_date']     = current_time('mysql');
     $commentdata['comment_date_gmt'] = current_time('mysql', 1);
+    
 
     $commentdata = wp_filter_comment($commentdata);
@@ -51 +55 @@
         if ( '0' == $commentdata['comment_approved'] )
             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']);
     }
@@ -80 +86 @@
 
 function wp_filter_comment($commentdata) {
-    $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_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
-    $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_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
+    $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_author']       = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
+    $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_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['filtered'] = true;