Changeset 42571 for branches/4.9

Timestamp:

01/23/2018 01:46:32 PM (7 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.
Merges [42570] to the 4.9 branch.
Fixes #42693.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (2 diffs)
• src/wp-includes/ms-functions.php (modified) (2 diffs)

branches/4.9/src/wp-includes/functions.php

@@ -5739 +5739 @@
  */
 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.
@@ -5748 +5755 @@
      * @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 ) {

branches/4.9/src/wp-includes/ms-functions.php

@@ -2663 +2663 @@
  */
 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.
@@ -2673 +2680 @@
      * @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 ) {