--- base/w/includes/User.php	2012-03-22 21:33:34.000000000 +0100
+++ en/w/includes/User.php	2012-03-24 02:01:26.000000000 +0100
@@ -3009,12 +3005,12 @@
 	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;
 	}