Ticket #33587: 33587.3.diff

src/wp-includes/comment-functions.php

@@ -1629 +1629 @@
          */
         do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'] );
 
-        if ( 'spam' !== $commentdata['comment_approved'] ) { // If it's spam save it silently for later crunching
-                if ( '0' == $commentdata['comment_approved'] ) {
-                        wp_notify_moderator( $comment_ID );
-                }
+        return $comment_ID;
+}
 
-                // wp_notify_postauthor() checks if notifying the author of their own comment.
-                // By default, it won't, but filters can override this.
-                if ( get_option( 'comments_notify' ) && $commentdata['comment_approved'] ) {
-                        wp_notify_postauthor( $comment_ID );
-                }
+/**
+ * Initiate a comment moderation notification for the comment moderator.
+ *
+ * @since 4.4.0
+ *
+ * @param int $comment_ID       ID of the comment.
+ * @param int $comment_approved Whether the comment is approved.
+ */
+function wp_new_comment_moderator_notification( $comment_ID, $comment_approved ) {
+        if ( '0' == $comment_approved ) {
+                wp_notify_moderator( $comment_ID );
         }
+}
 
-        return $comment_ID;
+/**
+ * Initiate a new comment notification for the post author.
+ *
+ * @since 4.4.0
+ *
+ * @param int $comment_ID       ID of the comment.
+ */
+function wp_new_comment_postauthor_notification( $comment_ID ) {
+        // wp_notify_postauthor() checks if notifying the author of their own comment.
+        // By default, it won't, but filters can override this.
+        if ( get_option( 'comments_notify' ) && $commentdata['comment_approved'] ) {
+                wp_notify_postauthor( $comment_ID );
+        }
 }
 
 /**

src/wp-includes/default-filters.php

@@ -334 +334 @@
 add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
 add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
 
+// Email notifications.
+add_action( 'comment_post', 'wp_new_comment_notify_moderator', 10, 2 );
+add_action( 'comment_post', 'wp_new_comment_notify_postauthor', 10 );
+add_action( 'after_password_reset', 'wp_password_change_notification' );
+add_action( 'register_new_user', 'wp_new_user_notification', 10, 2 );
+
 /**
  * Filters formerly mixed into wp-includes
  */

src/wp-includes/user-functions.php

@@ -1916 +1916 @@
         wp_set_password( $new_pass, $user->ID );
         update_user_option( $user->ID, 'default_password_nag', false, true );
 
-        wp_password_change_notification( $user );
+        /**
+         * Fires after the user's password is reset.
+         *
+         * @since 4.4.0
+         *
+         * @param object $user     The user.
+         * @param string $new_pass New user password.
+         */
+        do_action( 'after_password_reset', $user, $new_pass );
 }
 
 /**
@@ -2004 +2012 @@
 
         update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
 
-        wp_new_user_notification( $user_id, 'both' );
+        /**
+         * Fires after a new user registration has been recorded.
+         *
+         * @since 4.4.0
+         *
+         * @param int $user_id ID of the newly registered user.
+         * @param string $notify 'both' is passed to the filter for the `wp_new_user_notification()` callback.
+         */
+        do_action( 'register_new_user', $user_id, 'both' );
 
         return $user_id;
 }