WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Users: Switch to using array style filters for the newly introduced filters in `wp_password_change_notification()` and `wp_new_user_notification()`. 

This introduces three new filters, replacing those that were introduced in [41153]:

* `wp_password_change_notification_email`
* `wp_new_user_notification_email_admin`
* `wp_new_user_notification_email`

Props pbearne

Fixes #38068

Built from https://develop.svn.wordpress.org/trunk@41213


git-svn-id: http://core.svn.wordpress.org/trunk@41053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-08-03 13:21:46 +00:00
parent c184d766e9
commit dee0e3a67b
2 changed files with 74 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
wp-includes/pluggable.php
View File

@ -1748,41 +1748,38 @@ function wp_password_change_notification( $user ) {
// we want to reverse this for the plain text arena of emails. // we want to reverse this for the plain text arena of emails.
$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
/* translators: %s: site title */ $wp_password_change_notification_email = array(
$subject = sprintf( __( '[%s] Password Changed' ), $blogname ); 'to' => get_option( 'admin_email' ),
/* translators: Password change notification email subject. %s: Site title */
'subject' => __( '[%s] Password Changed' ),
'message' => $message,
'headers' => '',
);
/** /**
* Filters the subject of the password change notification email sent to the site admin. * Filters the contents of the password change notification email sent to the site admin.
* *
* @since 4.9.0 * @since 4.9.0
* *
* @param string $subject Email subject. * @param array $wp_password_change_notification_email {
* Used to build wp_mail().
*
* @type string $to The intended recipient - site admin email address.
* @type string $subject The subject of the email.
* @type string $message The body of the email.
* @type string $headers The headers of the email.
* }
* @param WP_User $user User object for user whose password was changed. * @param WP_User $user User object for user whose password was changed.
* @param string $blogname The site title. * @param string $blogname The site title.
*/ */
$subject = apply_filters( 'wp_password_change_notification_subject', $subject, $user, $blogname ); $wp_password_change_notification_email = apply_filters( 'wp_password_change_notification_email', $wp_password_change_notification_email, $user, $blogname );
/** wp_mail(
* Filters the message body of the password change notification email sent to the site admin. $wp_password_change_notification_email['to'],
* wp_specialchars_decode( sprintf( $wp_password_change_notification_email['subject'], $blogname ) ),
* @since 4.9.0 $wp_password_change_notification_email['message'],
* $wp_password_change_notification_email['headers']
* @param string $message Email message. );
* @param WP_User $user User object for user whose password was changed.
*/
$message = apply_filters( 'wp_password_change_notification_message', $message, $user );
/**
* Filters the email headers of the password change notification admin email sent to the site admin.
*
* @since 4.9.0
*
* @param string $headers Email headers.
* @param WP_User $user User object for user whose password was changed.
*/
$headers = apply_filters( 'wp_password_change_notification_headers', '', $user );
wp_mail( get_option( 'admin_email' ), wp_specialchars_decode( $subject ), $message, $headers );
} }
} }
endif; endif;
@ -1821,8 +1818,6 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
if ( 'user' !== $notify ) { if ( 'user' !== $notify ) {
$switched_locale = switch_to_locale( get_locale() ); $switched_locale = switch_to_locale( get_locale() );
/* translators: %s: site title */
$subject = sprintf( __( '[%s] New User Registration' ), $blogname );
/* translators: %s: site title */ /* translators: %s: site title */
$message = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n"; $message = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
/* translators: %s: user login */ /* translators: %s: user login */
@ -1830,38 +1825,38 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
/* translators: %s: user email address */ /* translators: %s: user email address */
$message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n"; $message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";
$wp_new_user_notification_email_admin = array(
'to' => get_option( 'admin_email' ),
/* translators: Password change notification email subject. %s: Site title */
'subject' => __( '[%s] New User Registration' ),
'message' => $message,
'headers' => '',
);
/** /**
* Filters the subject of the new user notification email sent to the site admin. * Filters the contents of the new user notification email sent to the site admin.
* *
* @since 4.9.0 * @since 4.9.0
* *
* @param string $subject Email subject. * @param array $wp_new_user_notification_email {
* @param WP_User $user User object for newly registered user. * Used to build wp_mail().
*
* @type string $to The intended recipient - site admin email address.
* @type string $subject The subject of the email.
* @type string $message The body of the email.
* @type string $headers The headers of the email.
* }
* @param WP_User $user User object for new user.
* @param string $blogname The site title. * @param string $blogname The site title.
*/ */
$subject = apply_filters( 'wp_new_user_notification_admin_subject', $subject, $user, $blogname ); $wp_new_user_notification_email_admin = apply_filters( 'wp_new_user_notification_email_admin', $wp_new_user_notification_email_admin, $user, $blogname );
/** @wp_mail(
* Filters the message body of the new user notification email sent to the site admin. $wp_new_user_notification_email_admin['to'],
* wp_specialchars_decode( sprintf( $wp_new_user_notification_email_admin['subject'], $blogname ) ),
* @since 4.9.0 $wp_new_user_notification_email_admin['message'],
* $wp_new_user_notification_email_admin['headers']
* @param string $message Email message. );
* @param WP_User $user User object for newly registered user.
*/
$message = apply_filters( 'wp_new_user_notification_admin_message', $message, $user );
/**
* Filters the email headers of the new user notification email sent to the site admin.
*
* @since 4.9.0
*
* @param string $headers Email headers.
* @param WP_User $user User object for newly registered user.
*/
$headers = apply_filters( 'wp_new_user_notification_admin_headers', '', $user );
@wp_mail( get_option( 'admin_email' ), wp_specialchars_decode( $subject ), $message, $headers );
if ( $switched_locale ) { if ( $switched_locale ) {
restore_previous_locale(); restore_previous_locale();
@ -1889,8 +1884,6 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
$switched_locale = switch_to_locale( get_user_locale( $user ) ); $switched_locale = switch_to_locale( get_user_locale( $user ) );
/* translators: %s: site title */
$subject = sprintf( __( '[%s] Your username and password info' ), $blogname );
/* translators: %s: user login */ /* translators: %s: user login */
$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n"; $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
$message .= __('To set your password, visit the following address:') . "\r\n\r\n"; $message .= __('To set your password, visit the following address:') . "\r\n\r\n";
@ -1898,39 +1891,38 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
$message .= wp_login_url() . "\r\n"; $message .= wp_login_url() . "\r\n";
$wp_new_user_notification_email = array(
'to' => $user->user_email,
/* translators: Password change notification email subject. %s: Site title */
'subject' => __( '[%s] Your username and password info' ),
'message' => $message,
'headers' => '',
);
/** /**
* Filters the subject of the new user email sent to the new user. * Filters the contents of the new user notification email sent to the new user.
* *
* @since 4.9.0 * @since 4.9.0
* *
* @param string $subject Email subject. * @param array $wp_new_user_notification_email {
* @param WP_User $user User object for newly registered user. * Used to build wp_mail().
*
* @type string $to The intended recipient - New user email address.
* @type string $subject The subject of the email.
* @type string $message The body of the email.
* @type string $headers The headers of the email.
* }
* @param WP_User $user User object for new user.
* @param string $blogname The site title. * @param string $blogname The site title.
*/ */
$subject = apply_filters( 'wp_new_user_notification_subject', $subject, $user, $blogname ); $wp_new_user_notification_email = apply_filters( 'wp_new_user_notification_email', $wp_new_user_notification_email, $user, $blogname );
/** wp_mail(
* Filters the message body of the new user email sent to the new user. $wp_new_user_notification_email['to'],
* wp_specialchars_decode( sprintf( $wp_new_user_notification_email['subject'], $blogname ) ),
* @since 4.9.0 $wp_new_user_notification_email['message'],
* $wp_new_user_notification_email['headers']
* @param string $message Email message. );
* @param WP_User $user User object for newly registered user.
* @param string $key User activation key.
*/
$message = apply_filters( 'wp_new_user_notification_message', $message, $user, $key );
/**
* Filters the email headers of the new user email sent to the new user.
*
* @since 4.9.0
*
* @param string $headers Email headers.
* @param WP_User $user User object for newly registered user.
*/
$headers = apply_filters( 'wp_new_user_notification_headers', '', $user );
wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $headers );
if ( $switched_locale ) { if ( $switched_locale ) {
restore_previous_locale(); restore_previous_locale();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41209'; $wp_version = '4.9-alpha-41213';
/** /**
* 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.