From 621085a3606786e2705c37499b230a690cb0d32f Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 14 Mar 2016 22:31:27 +0000
Subject: [PATCH] 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
---
 wp-includes/pluggable.php | 7 +++++--
 wp-includes/version.php   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 8db1a518e8..b69942c866 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -501,6 +501,7 @@ if ( !function_exists('wp_authenticate') ) :
  * Authenticate a user, confirming the login credentials are valid.
  *
  * @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 $password User's password.
@@ -518,10 +519,11 @@ function wp_authenticate($username, $password) {
 	 * WP_Error or null otherwise.
 	 *
 	 * @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.
 	 *                                        WP_Error or null otherwise.
-	 * @param string                $username User login.
+	 * @param string                $username Username or email address.
 	 * @param string                $password User password
 	 */
 	$user = apply_filters( 'authenticate', null, $username, $password );
@@ -539,8 +541,9 @@ function wp_authenticate($username, $password) {
 		 * Fires after a user login has failed.
 		 *
 		 * @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 );
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 393befea1d..db9a65a068 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.