Fix broken email confirmation expiration caused by MWCryptRand changes.

Change-Id: I7ef0913074f372b5ace3d14993e0e3a914b9f22c

diff --git a/includes/User.php b/includes/User.php
index 566dcc7..42c58ab 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -3303,11 +3303,12 @@ class User {
                global $wgUserEmailConfirmationTokenExpiry;
                $now = time();
                $expires = $now + $wgUserEmailConfirmationTokenExpiry;
+               $expiration = wfTimestamp( TS_MW, $expires );
                $this->load();
                $token = MWCryptRand::generateHex( 32 );
                $hash = md5( $token );
                $this->mEmailToken = $hash;
-               $this->mEmailTokenExpires = wfTimestamp( TS_MW, $expires );
+               $this->mEmailTokenExpires = $expiration;
                return $token;
        }