dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix documentation for RevisionRecord::$mPageId"
[lhc/web/wiklou.git]
/
includes
/
auth
/
TemporaryPasswordPrimaryAuthenticationProvider.php
diff --git
a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
index
4a2d009
..
045f791
100644
(file)
--- a/
includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
+++ b/
includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
@@
-146,7
+146,7
@@
class TemporaryPasswordPrimaryAuthenticationProvider
}
$pwhash = $this->getPassword( $row->user_newpassword );
}
$pwhash = $this->getPassword( $row->user_newpassword );
- if ( !$pwhash->
equals
( $req->password ) ) {
+ if ( !$pwhash->
verify
( $req->password ) ) {
return $this->failResponse( $req );
}
return $this->failResponse( $req );
}
@@
-314,7
+314,7
@@
class TemporaryPasswordPrimaryAuthenticationProvider
if ( $sendMail ) {
// Send email after DB commit
if ( $sendMail ) {
// Send email after DB commit
- $dbw->onTransactionIdle(
+ $dbw->onTransaction
CommitOr
Idle(
function () use ( $req ) {
/** @var TemporaryPasswordAuthenticationRequest $req */
$this->sendPasswordResetEmail( $req );
function () use ( $req ) {
/** @var TemporaryPasswordAuthenticationRequest $req */
$this->sendPasswordResetEmail( $req );
@@
-388,7
+388,7
@@
class TemporaryPasswordPrimaryAuthenticationProvider
if ( $mailpassword ) {
// Send email after DB commit
if ( $mailpassword ) {
// Send email after DB commit
- wfGetDB( DB_MASTER )->onTransactionIdle(
+ wfGetDB( DB_MASTER )->onTransaction
CommitOr
Idle(
function () use ( $user, $creator, $req ) {
$this->sendNewAccountEmail( $user, $creator, $req->password );
},
function () use ( $user, $creator, $req ) {
$this->sendNewAccountEmail( $user, $creator, $req->password );
},