dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a7b4d3
)
Fix broken email confirmation expiration caused by MWCryptRand changes.
author
Daniel Friesen
<pub-github@nadir-seen-fire.com>
Mon, 26 Mar 2012 03:44:57 +0000
(20:44 -0700)
committer
Daniel Friesen
<pub-github@nadir-seen-fire.com>
Mon, 26 Mar 2012 03:48:20 +0000
(20:48 -0700)
Change-Id: I7ef0913074f372b5ace3d14993e0e3a914b9f22c
includes/User.php
patch
|
blob
|
history
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;
}