Changeset 42570

Timestamp:

01/23/2018 01:44:25 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Email: Don't send notifications for site or network admin email address change to the default 'admin_email' value.

Props tigertech, MattyRob, seanchayes.
Fixes #42693.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (2 diffs)
• ms-functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -5994 +5994 @@
  */
 function wp_site_admin_email_change_notification( $old_email, $new_email, $option_name ) {
+        $send = true;
+
+        // Don't send the notification to the default 'admin_email' value.
+        if ( 'you@example.com' === $old_email ) {
+                $send = false;
+        }
+
         /**
          * Filters whether to send the site admin email change notification email.
@@ -6003 +6010 @@
          * @param string $new_email The new site admin email address.
          */
-        $send = apply_filters( 'send_site_admin_email_change_email', true, $old_email, $new_email );
+        $send = apply_filters( 'send_site_admin_email_change_email', $send, $old_email, $new_email );
 
         if ( ! $send ) {

trunk/src/wp-includes/ms-functions.php

@@ -2843 +2843 @@
  */
 function wp_network_admin_email_change_notification( $option_name, $new_email, $old_email, $network_id ) {
+        $send = true;
+
+        // Don't send the notification to the default 'admin_email' value.
+        if ( 'you@example.com' === $old_email ) {
+                $send = false;
+        }
+
         /**
          * Filters whether to send the network admin email change notification email.
@@ -2853 +2860 @@
          * @param int    $network_id ID of the network.
          */
-        $send = apply_filters( 'send_network_admin_email_change_email', true, $old_email, $new_email, $network_id );
+        $send = apply_filters( 'send_network_admin_email_change_email', $send, $old_email, $new_email, $network_id );
 
         if ( ! $send ) {