Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-01 05:57:55 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Props tigertech, MattyRob, seanchayes.
Merges [42570] to the 4.9 branch.
Fixes #42693.
Built from https://develop.svn.wordpress.org/branches/4.9@42571


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-01-23 13:47:40 +00:00
parent 54194f2ec6
commit 8662725a4b
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/functions.php
View File

@ -5738,6 +5738,13 @@ function wp_cache_get_last_changed( $group ) {
* @param string $option_name The relevant database option name. * @param string $option_name The relevant database option name.
*/ */
function wp_site_admin_email_change_notification( $old_email, $new_email, $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. * Filters whether to send the site admin email change notification email.
* *
@ -5747,7 +5754,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 $old_email The old site admin email address.
* @param string $new_email The new 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 ) { if ( ! $send ) {
return; return;

9
wp-includes/ms-functions.php
View File

@ -2662,6 +2662,13 @@ All at ###SITENAME###
* @param int $network_id ID of the network. * @param int $network_id ID of the network.
*/ */
function wp_network_admin_email_change_notification( $option_name, $new_email, $old_email, $network_id ) { 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. * Filters whether to send the network admin email change notification email.
* *
@ -2672,7 +2679,7 @@ function wp_network_admin_email_change_notification( $option_name, $new_email, $
* @param string $new_email The new network admin email address. * @param string $new_email The new network admin email address.
* @param int $network_id ID of the network. * @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 ) { if ( ! $send ) {
return; return;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.3-alpha-42569'; $wp_version = '4.9.3-alpha-42571';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.