From 53cb41fc3cf35481419fed346577f64e449876ba Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 11 Mar 2009 22:49:30 +0000 Subject: [PATCH] Always wp_authenticate in wp-app. Props wnorris. fixes #9320 git-svn-id: http://svn.automattic.com/wordpress/trunk@10771 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-app.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/wp-app.php b/wp-app.php index e913286f0..29994e43e 100644 --- a/wp-app.php +++ b/wp-app.php @@ -1492,12 +1492,13 @@ EOD; // If Basic Auth is working... if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']); - $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); - if ( $user && !is_wp_error($user) ) { - wp_set_current_user($user->ID); - log_app("authenticate()", $_SERVER['PHP_AUTH_USER']); - return true; - } + } + + $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); + if ( $user && !is_wp_error($user) ) { + wp_set_current_user($user->ID); + log_app("authenticate()", $user->user_login); + return true; } return false;