From a8ccd1ce2390d6b776e00f17496251ba98bba417 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Thu, 14 Jul 2016 21:51:32 +0000 Subject: [PATCH] Users: Update help text for `user-new.php` to remove reference to sending passwords via email. Props anneschmidt. Fixes #36763. Built from https://develop.svn.wordpress.org/trunk@38064 git-svn-id: http://core.svn.wordpress.org/trunk@38005 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/user-new.php | 5 +++-- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 14a6a63411..42732434a1 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -175,8 +175,9 @@ if ( is_multisite() ) { $help .= '

' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users.') . '

' . '

' . __('New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to receive a welcome email.') . '

'; } else { - $help .= '

' . __('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.') . '

' . - '

' . __('New users will receive an email letting them know they’ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don’t want the password to be included in the welcome email.') . '

'; + $help .= '

' . __('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.') . '

' . + + '

' . __('By default, new users will receive an email letting them know they’ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don’t want to send the new user a welcome email.') . '

'; } $help .= '

' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '

'; diff --git a/wp-includes/version.php b/wp-includes/version.php index 04e7c8241d..00c1971a31 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta3-38063'; +$wp_version = '4.6-beta3-38064'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.