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 "Make WrapOldPasswords pass "refresh" to User::clearSharedCache()"
[lhc/web/wiklou.git]
/
includes
/
auth
/
AuthManager.php
diff --git
a/includes/auth/AuthManager.php
b/includes/auth/AuthManager.php
index
946decf
..
3515a70
100644
(file)
--- a/
includes/auth/AuthManager.php
+++ b/
includes/auth/AuthManager.php
@@
-1006,7
+1006,7
@@
class AuthManager implements LoggerAwareInterface {
if ( $block ) {
$errorParams = [
$block->getTarget(),
if ( $block ) {
$errorParams = [
$block->getTarget(),
- $block->
mReason
?: wfMessage( 'blockednoreason' )->text(),
+ $block->
getReason()
?: wfMessage( 'blockednoreason' )->text(),
$block->getByName()
];
$block->getByName()
];
@@
-1423,7
+1423,7
@@
class AuthManager implements LoggerAwareInterface {
// @codeCoverageIgnoreEnd
}
$this->setDefaultUserOptions( $user, $creator->isAnon() );
// @codeCoverageIgnoreEnd
}
$this->setDefaultUserOptions( $user, $creator->isAnon() );
- \Hooks::run( 'LocalUserCreated', [ $user, false ] );
+ \Hooks::run
WithoutAbort
( 'LocalUserCreated', [ $user, false ] );
$user->saveSettings();
$state['userid'] = $user->getId();
$user->saveSettings();
$state['userid'] = $user->getId();
@@
-2101,10
+2101,8
@@
class AuthManager implements LoggerAwareInterface {
$id = $req->getUniqueId();
// If a required request if from a Primary, mark it as "primary-required" instead
$id = $req->getUniqueId();
// If a required request if from a Primary, mark it as "primary-required" instead
- if ( $isPrimary ) {
- if ( $req->required ) {
- $req->required = AuthenticationRequest::PRIMARY_REQUIRED;
- }
+ if ( $isPrimary && $req->required ) {
+ $req->required = AuthenticationRequest::PRIMARY_REQUIRED;
}
if (
}
if (