Ticket #6892: 6892.diff

wp-includes/comment.php

@@ -734 +734 @@
                         break;
                 case 'approve':
                         $query = $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='1' WHERE comment_ID = %d LIMIT 1", $comment_id);
-                        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':
                         $query = $wpdb->prepare("UPDATE $wpdb->comments SET comment_approved='spam' WHERE comment_ID = %d LIMIT 1", $comment_id);

wp-admin/comment.php

@@ -193 +193 @@
 
         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() );
         else
@@ -229 +225 @@
 
 include('admin-footer.php');
 
-?>
- No newline at end of file
+?>