From e9599bc7b5561659fe54dda03108bcef51122c5f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 23 Jan 2018 13:45:32 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@42570


git-svn-id: http://core.svn.wordpress.org/trunk@42399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php    | 9 ++++++++-
 wp-includes/ms-functions.php | 9 ++++++++-
 wp-includes/version.php      | 2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 7d41b37aef..ec5a3d26ce 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -5993,6 +5993,13 @@ function wp_cache_get_last_changed( $group ) {
  * @param string $option_name The relevant database option name.
  */
 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.
 	 *
@@ -6002,7 +6009,7 @@ function wp_site_admin_email_change_notification( $old_email, $new_email, $optio
 	 * @param string $old_email The old site admin email address.
 	 * @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 ) {
 		return;
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 984a69ce6f..c878739d6e 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -2842,6 +2842,13 @@ All at ###SITENAME###
  * @param int    $network_id  ID of the network.
  */
 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.
 	 *
@@ -2852,7 +2859,7 @@ function wp_network_admin_email_change_notification( $option_name, $new_email, $
 	 * @param string $new_email  The new network admin email address.
 	 * @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 ) {
 		return;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c2db2cf4b4..32905a859a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42568';
+$wp_version = '5.0-alpha-42570';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.