Improve notes notifications implementation

src/wp-admin/includes/schema.php

@@ -563,7 +563,6 @@ function populate_options( array $options = array() ) {
 
 		// 6.9.0
 		'wp_notes_notify'                 => 1,
-
 	);
 
 	// 3.3.0

src/wp-admin/options-discussion.php

@@ -162,7 +162,7 @@
 <?php _e( 'A comment is held for moderation' ); ?> </label>
 <br />
 <label for="wp_notes_notify">
-<input name="wp_notes_notify" type="checkbox" id="wp_notes_notify" value="1" <?php checked( '1', get_option( 'wp_notes_notify' ) ); ?> />
+<input name="wp_notes_notify" type="checkbox" id="wp_notes_notify" value="1" <?php checked( '1', get_option( 'wp_notes_notify', 1 ) ); ?> />
 <?php _e( 'Anyone posts a note' ); ?> </label>
 
 </fieldset></td>

src/wp-includes/comment.php

@@ -2427,7 +2427,7 @@ function wp_new_comment_notify_postauthor( $comment_id ) {
 	$comment = get_comment( $comment_id );
 	$is_note = ( $comment && 'note' === $comment->comment_type );
 
-	$maybe_notify = $is_note ? get_option( 'wp_notes_notify' ) : get_option( 'comments_notify' );
+	$maybe_notify = $is_note ? get_option( 'wp_notes_notify', 1 ) : get_option( 'comments_notify' );
 
 	/**
 	 * Filters whether to send the post author new comment notification emails,
@@ -2458,6 +2458,19 @@ function wp_new_comment_notify_postauthor( $comment_id ) {
 	return wp_notify_postauthor( $comment_id );
 }
 
+/**
+ * Send a notification to the post author when a new note is added via the REST API.
+ *
+ * @since 6.9.0
+ *
+ * @param WP_Comment $comment The comment object.
+ */
+function wp_new_comment_via_rest_notify_postauthor( $comment ) {
+	if ( $comment instanceof WP_Comment && 'note' === $comment->comment_type ) {
+		wp_new_comment_notify_postauthor( (int) $comment->comment_ID );
+	}
+}
+
 /**
  * Sets the status of a comment.
  *

src/wp-includes/default-filters.php

@@ -522,7 +522,7 @@
 // Email notifications.
 add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
 add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
-add_action( 'rest_insert_comment', array( 'WP_REST_Comments_Controller', 'wp_new_comment_via_rest_notify_postauthor' ) );
+add_action( 'rest_insert_comment', 'wp_new_comment_via_rest_notify_postauthor' );
 add_action( 'after_password_reset', 'wp_password_change_notification' );
 add_action( 'register_new_user', 'wp_send_new_user_notifications' );
 add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -36,18 +36,6 @@ public function __construct() {
 		$this->meta = new WP_REST_Comment_Meta_Fields();
 	}
 
-	/**
-	 * Send a notification to the post author when a new note is added via the REST API.
-	 *
-	 * @since 6.9.0
-	 *
-	 * @param WP_Comment $comment The comment object.
-	 */
-	public static function wp_new_comment_via_rest_notify_postauthor( $comment ) {
-		if ( 'note' === $comment->comment_type ) {
-			wp_new_comment_notify_postauthor( $comment->comment_ID );
-		}
-	}
 	/**
 	 * Registers the routes for comments.
 	 *