diff --git a/wp-includes/functions-user.php b/wp-includes/functions-user.php
index 3862e33ee..986679b20 100644
--- a/wp-includes/functions-user.php
+++ b/wp-includes/functions-user.php
@@ -2,8 +2,6 @@
function login($username, $password, $already_md5 = false) {
global $wpdb, $error;
- if ( !$already_md5 )
- $pwd = md5($password);
if ( !$username )
return false;
@@ -17,11 +15,10 @@ function login($username, $password, $already_md5 = false) {
if (!$login) {
$error = __('Error: Wrong login.');
- $pwd = '';
return false;
} else {
- if ( $login->user_login == $username && $login->user_pass == $pwd ) {
+ if ( ($login->user_login == $username && $login->user_pass == $password) || ($already_md5 && $login->user_login == $username && md5($login->user_pass) == $password) ) {
return true;
} else {
$error = __('Error: Incorrect password.');
diff --git a/wp-login.php b/wp-login.php
index 4534a55b2..719bd11a9 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -138,7 +138,7 @@ default:
if( !empty($_POST) ) {
$log = $_POST['log'];
- $pwd = $_POST['pwd'];
+ $pwd = md5($_POST['pwd']);
$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_POST['redirect_to']);
}
@@ -155,9 +155,9 @@ default:
header('Pragma: no-cache');
} else {
$user_login = $log;
- $user_pass = md5($pwd);
- setcookie('wordpressuser_'.$cookiehash, $user_login, time() + 31536000, COOKIEPATH);
- setcookie('wordpresspass_'.$cookiehash, md5($user_pass), time() + 31536000, COOKIEPATH);
+ $user_pass = $pwd;
+ setcookie('wordpressuser_'. COOKIEHASH, $user_login, time() + 31536000, COOKIEPATH);
+ setcookie('wordpresspass_'. COOKIEHASH, md5($user_pass), time() + 31536000, COOKIEPATH);
header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
@@ -175,16 +175,16 @@ default:
$user_pass_md5 = $_COOKIE['wordpresspass_' . COOKIEHASH];
}
- if ( !login($user_login, $user_pass_md5, true) ) {
- if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
- $error = 'Your session has expired.';
- } else {
+ if ( login($user_login, $user_pass_md5, true) ) {
header('Expires: Wed, 5 Jun 1979 23:41:00 GMT'); // Michel's birthday
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-cache, must-revalidate');
header('Pragma: no-cache');
header('Location: wp-admin/');
exit();
+ } else {
+ if ( !empty($_COOKIE['wordpressuser_' . COOKIEHASH]) )
+ $error = 'Your session has expired.';
}
?>
@@ -210,7 +210,7 @@ if ($error)
echo "$error
";
?>
-