WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid notices in wp_notify_postauthor() when a post has no author. 

props drozdz.
fixes #26659.

Built from https://develop.svn.wordpress.org/trunk@27568


git-svn-id: http://core.svn.wordpress.org/trunk@27411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-03-17 20:31:14 +00:00
parent e7be7a0a8d
commit 182de5881d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/pluggable.php
View File

@ -1032,7 +1032,10 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
$author = get_userdata( $post->post_author ); $author = get_userdata( $post->post_author );
// Who to notify? By default, just the post author, but others can be added. // Who to notify? By default, just the post author, but others can be added.
$emails = array( $author->user_email ); $emails = array();
if ( $author ) {
$emails[] = $author->user_email;
}
/** /**
* Filter the list of emails to receive a comment notification. * Filter the list of emails to receive a comment notification.
@ -1070,17 +1073,17 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
$notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id ); $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id );
// The comment was left by the author // The comment was left by the author
if ( ! $notify_author && $comment->user_id == $post->post_author ) { if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
unset( $emails[ $author->user_email ] ); unset( $emails[ $author->user_email ] );
} }
// The author moderated a comment on their own post // The author moderated a comment on their own post
if ( ! $notify_author && $post->post_author == get_current_user_id() ) { if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
unset( $emails[ $author->user_email ] ); unset( $emails[ $author->user_email ] );
} }
// The post author is no longer a member of the blog // The post author is no longer a member of the blog
if ( ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) { if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
unset( $emails[ $author->user_email ] ); unset( $emails[ $author->user_email ] );
} }