rename notes_notify -> wp_ notes_notify

Author: adamsilverstein

src/wp-admin/includes/schema.php

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

src/wp-admin/options-discussion.php

@@ -161,8 +161,8 @@
 <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' ) ); ?> />
+<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' ) ); ?> />
 <?php _e( 'Anyone posts a note' ); ?> </label>
 
 </fieldset></td>

src/wp-admin/options.php

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

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( 'notes_notify' ) : get_option( 'comments_notify' );
+	$maybe_notify = $is_note ? get_option( 'wp_notes_notify' ) : get_option( 'comments_notify' );
 
 	/**
 	 * Filters whether to send the post author new comment notification emails,