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

Remove redundant add_filter() call. see [24848]. fixes #27255. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@27202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-03-02 18:21:14 +00:00
parent 45ac85f67f
commit 2e288a108c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/user.php
View File

@ -102,9 +102,10 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
/** /**
* Authenticate the user using the username and password. * Authenticate the user using the username and password.
*/ */
add_filter('authenticate', 'wp_authenticate_username_password', 20, 3);
function wp_authenticate_username_password($user, $username, $password) { function wp_authenticate_username_password($user, $username, $password) {
if ( is_a($user, 'WP_User') ) { return $user; } if ( is_a( $user, 'WP_User' ) ) {
return $user;
}
if ( empty($username) || empty($password) ) { if ( empty($username) || empty($password) ) {
if ( is_wp_error( $user ) ) if ( is_wp_error( $user ) )
@ -150,7 +151,9 @@ function wp_authenticate_username_password($user, $username, $password) {
* Authenticate the user using the WordPress auth cookie. * Authenticate the user using the WordPress auth cookie.
*/ */
function wp_authenticate_cookie($user, $username, $password) { function wp_authenticate_cookie($user, $username, $password) {
if ( is_a($user, 'WP_User') ) { return $user; } if ( is_a( $user, 'WP_User' ) ) {
return $user;
}
if ( empty($username) && empty($password) ) { if ( empty($username) && empty($password) ) {
$user_id = wp_validate_auth_cookie(); $user_id = wp_validate_auth_cookie();