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

Docs: Remove unused `###USERNAME###` placeholder reference from `user_request_action_email_content` filter documentation. 

Props desrosj.
Merges [43189] to the 4.9 branch.
Fixes #44016.
Built from https://develop.svn.wordpress.org/branches/4.9@43190


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-09 14:39:26 +00:00
parent 094c20d004
commit 9209c0738c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/user.php
View File

@ -3034,20 +3034,20 @@ All at ###SITENAME###
* Filters the text of the email sent when an account action is attempted.
*
* The following strings have a special meaning and will get replaced dynamically:
* ###USERNAME### The user's username, if the user has an account. Prefixed with single space. Otherwise left blank.
*
* ###DESCRIPTION### Description of the action being performed so the user knows what the email is for.
* ###CONFIRM_URL### The link to click on to confirm the account action.
* ###EMAIL### The email we are sending to.
* ###SITENAME### The name of the site.
* ###SITEURL### The URL to the site.
* ###EMAIL### The email we are sending to.
* ###SITENAME### The name of the site.
* ###SITEURL### The URL to the site.
*
* @since 4.9.6
*
* @param string $email_text Text in the email.
* @param string $email_text Text in the email.
* @param array $email_data {
* Data relating to the account action email.
*
* @type WP_User_Request $request User request object.
* @type WP_User_Request $request User request object.
* @type string $email The email address this is being sent to.
* @type string $description Description of the action being performed so the user knows what the email is for.
* @type string $confirm_url The link to click on to confirm the account action.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.6-beta1-43188';
$wp_version = '4.9.6-beta1-43190';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.