Add separate notes notification setting

Author: adamsilverstein

src/wp-admin/includes/schema.php

@@ -421,6 +421,7 @@ function populate_options( array $options = array() ) {
 		'use_smilies'                     => 1,
 		'require_name_email'              => 1,
 		'comments_notify'                 => 1,
+		'notes_notify'                    => 1,
 		'posts_per_rss'                   => 10,
 		'rss_use_excerpt'                 => 0,
 		'mailserver_url'                  => 'mail.example.com',

src/wp-admin/options-discussion.php

@@ -155,11 +155,16 @@
 <td><fieldset><legend class="screen-reader-text"><span><?php echo $email_me_whenever_title; ?></span></legend>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked( '1', get_option( 'comments_notify' ) ); ?> />
-<?php _e( 'Anyone posts a comment or note' ); ?> </label>
+<?php _e( 'Anyone posts a comment' ); ?> </label>
 <br />
 <label for="moderation_notify">
 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked( '1', get_option( 'moderation_notify' ) ); ?> />
 <?php _e( 'A comment is held for moderation' ); ?> </label>
+<br />
+<label for="notes_notify">
+<input name="notes_notify" type="checkbox" id="notes_notify" value="1" <?php checked( '1', get_option( 'notes_notify' ) ); ?> />
+<?php _e( 'Anyone posts a note' ); ?> </label>
+
 </fieldset></td>
 </tr>
 <?php $before_comment_appears_title = __( 'Before a comment appears' ); ?>

src/wp-admin/options.php

@@ -125,6 +125,7 @@
 		'comment_order',
 		'comment_registration',
 		'show_comments_cookies_opt_in',
+		'notes_notify',
 	),
 	'media'      => array(
 		'thumbnail_size_w',

src/wp-includes/comment.php

@@ -2425,8 +2425,9 @@ function wp_new_comment_notify_moderator( $comment_id ) {
  */
 function wp_new_comment_notify_postauthor( $comment_id ) {
 	$comment = get_comment( $comment_id );
+	$isNote  = ( 'note' === $comment->comment_type );
 
-	$maybe_notify = get_option( 'comments_notify' );
+	$maybe_notify = $isNote ? get_option( 'notes_notify' ) : get_option( 'comments_notify' );
 
 	/**
 	 * Filters whether to send the post author new comment notification emails,
@@ -2450,7 +2451,7 @@ function wp_new_comment_notify_postauthor( $comment_id ) {
 	// Send notifications for approved comments and all notes.
 	if (
 		! isset( $comment->comment_approved ) ||
-		( '1' !== $comment->comment_approved && 'note' !== $comment->comment_type ) ) {
+		( '1' !== $comment->comment_approved && $isNote ) ) {
 			return false;
 	}