X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=includes%2Fauth%2FAuthManager.php;h=3515a7012c74db95359f4dd60b06e57bfaca3635;hb=4aabbfdb0f81356a6da52733313caf62c623afea;hp=946decf998250320f89ca1401904f972bcadf681;hpb=309c7b316f17daf567ff295fa5b5203cfc499141;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index 946decf998..3515a7012c 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -1006,7 +1006,7 @@ class AuthManager implements LoggerAwareInterface {
 		if ( $block ) {
 			$errorParams = [
 				$block->getTarget(),
-				$block->mReason ?: wfMessage( 'blockednoreason' )->text(),
+				$block->getReason() ?: wfMessage( 'blockednoreason' )->text(),
 				$block->getByName()
 			];
 
@@ -1423,7 +1423,7 @@ class AuthManager implements LoggerAwareInterface {
 					// @codeCoverageIgnoreEnd
 				}
 				$this->setDefaultUserOptions( $user, $creator->isAnon() );
-				\Hooks::run( 'LocalUserCreated', [ $user, false ] );
+				\Hooks::runWithoutAbort( 'LocalUserCreated', [ $user, false ] );
 				$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
-				if ( $isPrimary ) {
-					if ( $req->required ) {
-						$req->required = AuthenticationRequest::PRIMARY_REQUIRED;
-					}
+				if ( $isPrimary && $req->required ) {
+					$req->required = AuthenticationRequest::PRIMARY_REQUIRED;
 				}
 
 				if (