MediaWiki 1.17.4

[autoinstalls/mediawiki.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index 0c951cf605f27d7effeaaa4cd415366ec62ce1d2..c0de2023b8f9b4d6ff8c5bb8fdbbe848e545d448 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -3009,12 +3009,12 @@ class User {
        function confirmationToken( &$expiration ) {
                $now = time();
                $expires = $now + 7 * 24 * 60 * 60;
-               $expiration = 
+               $expiration = wfTimestamp( TS_MW, $expires );
                $token = MWCryptRand::generateHex( 32 );
                $hash = md5( $token );
                $this->load();
                $this->mEmailToken = $hash;
-               $this->mEmailTokenExpires = wfTimestamp( TS_MW, $expires );
+               $this->mEmailTokenExpires = $expiration;
                return $token;
        }
 
@@ -3595,7 +3595,7 @@ class User {
                } elseif ( $type == ':B:' ) {
                        # Salted
                        list( $salt, $realHash ) = explode( ':', substr( $hash, 3 ), 2 );
-                       return md5( $salt.'-'.md5( $password ) ) == $realHash;
+                       return md5( $salt.'-'.md5( $password ) ) === $realHash;
                } else {
                        # Old-style
                        return self::oldCrypt( $password, $userId ) === $hash;