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

Comments: Ensure only approved comments trigger post author notifications 

Posts that are trashed shouldn't trigger post author notifications. Adds unit tests to enforce this.

Merges [36119] to the 4.4 branch.
Props scottbrownconsulting, peterwilsoncc, swissspidy.
Fixes #35006.

Built from https://develop.svn.wordpress.org/branches/4.4@36146


git-svn-id: http://core.svn.wordpress.org/branches/4.4@36112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2016-01-02 03:35:21 +00:00
parent ac6b8ae319
commit 3ce481f130
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/comment.php
View File

@ -1805,7 +1805,7 @@ function wp_new_comment_notify_postauthor( $comment_ID ) {
} }
// Only send notifications for approved comments. // Only send notifications for approved comments.
if ( ! isset( $comment->comment_approved ) || 'spam' === $comment->comment_approved || ! $comment->comment_approved ) { if ( ! isset( $comment->comment_approved ) || '1' != $comment->comment_approved ) {
return false; return false;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4.1-alpha-36145'; $wp_version = '4.4.1-alpha-36146';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.