Changeset 8005

Timestamp:

05/28/2008 03:42:04 PM (17 years ago)

Author:

ryan

Message:

Fix duplicate comment notifications. Props MtDewVirus. fixes #6892 for 2.5

Location:

branches/2.5

Files:

• wp-admin/comment.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)

branches/2.5/wp-admin/comment.php

@@ -194 +194 @@
     wp_set_comment_status( $comment->comment_ID, 'approve' );
 
-    if ( true == get_option('comments_notify') )
-        wp_notify_postauthor( $comment->comment_ID );
-
-
     if ( '' != wp_get_referer() && false == $noredir )
         wp_redirect( wp_get_referer() );

branches/2.5/wp-includes/comment.php

@@ -727 +727 @@
         case 'approve':
             $query = "UPDATE $wpdb->comments SET comment_approved='1' WHERE comment_ID='$comment_id' LIMIT 1";
-            if ( get_option( 'comments_notify' ) == true )
-                wp_notify_postauthor( $comment_id );
+            if ( get_option('comments_notify') ) {
+                $comment = get_comment($comment_id);
+                wp_notify_postauthor($comment_id, $comment->comment_type);
+            }
+
             break;
         case 'spam':