Ticket #20007: wp-reg-notify-option-patch2.diff

wp-admin/includes/schema.php

@@ -387 +387 @@
         'links_recently_updated_time' => 120,
         'comment_moderation' => 0,
         'moderation_notify' => 1,
+        'registration_notify' => 1,
+        'password_reset_notify' => 1,
         'permalink_structure' => '',
         'gzipcompression' => 0,
         'hack_file' => 0,

wp-admin/options-discussion.php

@@ -120 +120 @@
 <tr valign="top">
 <th scope="row"><?php _e('E-mail me whenever'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
+<label for="registration_notify">
+<input name="registration_notify" type="checkbox" id="registration_notify" value="1" <?php checked('1', get_option('registration_notify')); ?> />
+<?php _e('Somebody registers'); ?> </label>
+<br />
 <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'); ?> </label>
@@ -127 +131 @@
 <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="password_reset_notify">
+<input name="password_reset_notify" type="checkbox" id="password_reset_notify" value="1" <?php checked('1', get_option('password_reset_notify')); ?> />
+<?php _e('Anyone resets their password'); ?> </label>
 </fieldset></td>
 </tr>
 <tr valign="top">

wp-admin/options.php

@@ -60 +60 @@
 
 $whitelist_options = array(
         'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
-        'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
+        'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'registration_notify','comments_notify', 'moderation_notify', 'password_reset_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
         'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
         'privacy' => array( 'blog_public' ),
         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),

wp-includes/pluggable.php

@@ -1160 +1160 @@
 function wp_password_change_notification(&$user) {
         // send a copy of password change notification to the admin
         // but check to see if it's the admin whose password we're changing, and skip this
-        if ( $user->user_email != get_option('admin_email') ) {
+        if ( $user->user_email != get_option('admin_email') && 1 == get_option( 'password_reset_notify' ) ) {
                 $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
                 // The blogname option is escaped with esc_html on the way into the database in sanitize_option
                 // we want to reverse this for the plain text arena of emails.
@@ -1193 +1193 @@
         $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
         $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
 
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
-
+        if ( 1 == get_option( 'registration_notify' ) ) {
+            @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+        }
+        
         if ( empty($plaintext_pass) )
                 return;