IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Users: Introduce the invited_user_email filter for filtering the contents of the email sent when an existing user is invited to a site on Multisite.

Browse Source 
Props contact-banker, anand.au14, nikolam, johnbillion

Fixes #42132

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


git-svn-id: http://core.svn.wordpress.org/trunk@48791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2020-09-21 17:16:07 +00:00
parent aef504acfd
commit 175c2c5b7c
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wp-admin/user-new.php
View File

@ -59,7 +59,7 @@ if ( isset( $_REQUEST['action'] ) && 'adduser' === $_REQUEST['action'] ) {
} }
// Adding an existing user to this blog. // Adding an existing user to this blog.
$new_user_email = $user_details->user_email; $new_user_email = array();
$redirect = 'user-new.php'; $redirect = 'user-new.php';
$username = $user_details->user_login; $username = $user_details->user_login;
$user_id = $user_details->ID; $user_id = $user_details->ID;
@ -100,7 +100,7 @@ if ( isset( $_REQUEST['action'] ) && 'adduser' === $_REQUEST['action'] ) {
$role = $roles[ $_REQUEST['role'] ]; $role = $roles[ $_REQUEST['role'] ];
/** /**
* Fires immediately after a user is invited to join a site, but before the notification is sent. * Fires immediately after an existing user is invited to join the site, but before the notification is sent.
* *
* @since 4.4.0 * @since 4.4.0
* *
@ -123,20 +123,46 @@ Please click the following link to confirm the invite:
%4$s' %4$s'
); );
wp_mail( $new_user_email['to'] = $user_details->user_email;
$new_user_email, $new_user_email['subject'] = sprintf(
sprintf(
/* translators: Joining confirmation notification email subject. %s: Site title. */ /* translators: Joining confirmation notification email subject. %s: Site title. */
__( '[%s] Joining Confirmation' ), __( '[%s] Joining Confirmation' ),
wp_specialchars_decode( get_option( 'blogname' ) ) wp_specialchars_decode( get_option( 'blogname' ) )
), );
sprintf( $new_user_email['message'] = sprintf(
$message, $message,
get_option( 'blogname' ), get_option( 'blogname' ),
home_url(), home_url(),
wp_specialchars_decode( translate_user_role( $role['name'] ) ), wp_specialchars_decode( translate_user_role( $role['name'] ) ),
home_url( "/newbloguser/$newuser_key/" ) home_url( "/newbloguser/$newuser_key/" )
) );
$new_user_email['headers'] = '';
/**
* Filters the contents of the email sent when an existing user is invited to join the site.
*
* @since 5.6.0
*
* @param array $new_user_email {
* Used to build wp_mail().
*
* @type string $to The email address of the invited user.
* @type string $subject The subject of the email.
* @type string $message The content of the email.
* @type string $headers Headers.
* }
* @param int $user_id The invited user's ID.
* @param array $role Array containing role information for the invited user.
* @param string $newuser_key The key of the invitation.
*
*/
$new_user_email = apply_filters( 'invited_user_email', $new_user_email, $user_id, $role, $newuser_key );
wp_mail(
$new_user_email['to'],
$new_user_email['subject'],
$new_user_email['message'],
$new_user_email['headers']
); );
if ( $switched_locale ) { if ( $switched_locale ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-49028'; $wp_version = '5.6-alpha-49029';
/** /**
* 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.