Changeset 24649 for trunk/wp-includes/pluggable.php

Timestamp:

07/10/2013 10:01:12 PM (13 years ago)

Author:

nacin

Message:

Do not notify the post author about comments if they are no longer a member of the blog.

This updates [23294] to use capability checks to determine if the user can still edit a post, which works for super admins. Additionally, it hides Trash/Spam action links when the user is still a member of the blog but cannot (or can no longer) moderate the comment.

fixes #23136.

File:

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

trunk/wp-includes/pluggable.php

@@ -990 +990 @@
         $author  = get_userdata( $post->post_author );
 
-        // The post author is no longer a member of the blog
-        if ( ! is_user_member_of_blog( $post->post_author ) )
-                return false;
-
         // The comment was left by the author
         if ( $comment->user_id == $post->post_author )
@@ -1000 +996 @@
         // The author moderated a comment on his own post
         if ( $post->post_author == get_current_user_id() )
+                return false;
+
+        // The post author is no longer a member of the blog
+        if ( ! user_can( $post->post_author, 'read_post', $post->ID ) )
                 return false;
 
@@ -1046 +1046 @@
         $notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
         $notify_message .= sprintf( __('Permalink: %s'), get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment_id ) . "\r\n";
-        if ( EMPTY_TRASH_DAYS )
-                $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
-        else
-                $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-        $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+
+        if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {
+                if ( EMPTY_TRASH_DAYS )
+                        $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
+                else
+                        $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
+                $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+        }
 
         $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));