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

Users: Add `@since` entries to `wp_authenticate()` and its filters now that the `$username` parameter can also be an email address. 

See #9568, #35986

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


git-svn-id: http://core.svn.wordpress.org/trunk@36959 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-03-14 22:31:27 +00:00
parent b9a3602070
commit 621085a360
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/pluggable.php
View File

@ -501,6 +501,7 @@ if ( !function_exists('wp_authenticate') ) :
* Authenticate a user, confirming the login credentials are valid. * Authenticate a user, confirming the login credentials are valid.
* *
* @since 2.5.0 * @since 2.5.0
* @since 4.5.0 $username can also be an email address.
* *
* @param string $username User's username or email address. * @param string $username User's username or email address.
* @param string $password User's password. * @param string $password User's password.
@ -518,10 +519,11 @@ function wp_authenticate($username, $password) {
* WP_Error or null otherwise. * WP_Error or null otherwise.
* *
* @since 2.8.0 * @since 2.8.0
* @since 4.5.0 $username can also be an email address.
* *
* @param null|WP_User|WP_Error $user WP_User if the user is authenticated. * @param null|WP_User|WP_Error $user WP_User if the user is authenticated.
* WP_Error or null otherwise. * WP_Error or null otherwise.
* @param string $username User login. * @param string $username Username or email address.
* @param string $password User password * @param string $password User password
*/ */
$user = apply_filters( 'authenticate', null, $username, $password ); $user = apply_filters( 'authenticate', null, $username, $password );
@ -539,8 +541,9 @@ function wp_authenticate($username, $password) {
* Fires after a user login has failed. * Fires after a user login has failed.
* *
* @since 2.5.0 * @since 2.5.0
* @since 4.5.0 $username can also be an email address.
* *
* @param string $username User login. * @param string $username Username or email address.
*/ */
do_action( 'wp_login_failed', $username ); do_action( 'wp_login_failed', $username );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta3-36991'; $wp_version = '4.5-beta3-36992';
/** /**
* 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.