X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=blobdiff_plain;f=includes%2Fspecialpage%2FLoginSignupSpecialPage.php;h=8be029aac8830bc829a8834cfce2d7014a769a67;hb=db3a8beb778ba841cf6bf795312bdba796c58ee5;hp=ce80c1a311437e34612a724858cd8e89701f75d5;hpb=f9fbcfd93905d4a9909bead84d3cf4364f4e5254;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index ce80c1a311..8be029aac8 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -95,9 +95,8 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 
 	/**
 	 * Load basic request parameters for this Special page.
-	 * @param string $subPage
 	 */
-	private function loadRequestParameters( $subPage ) {
+	private function loadRequestParameters() {
 		if ( $this->mLoadedRequest ) {
 			return;
 		}
@@ -105,7 +104,6 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		$request = $this->getRequest();
 
 		$this->mPosted = $request->wasPosted();
-		$this->mIsReturn = $subPage === 'return';
 		$this->mAction = $request->getVal( 'action' );
 		$this->mFromHTTP = $request->getBool( 'fromhttp', false )
 			|| $request->getBool( 'wpFromhttp', false );
@@ -124,7 +122,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	protected function load( $subPage ) {
 		global $wgSecureLogin;
 
-		$this->loadRequestParameters( $subPage );
+		$this->loadRequestParameters();
 		if ( $this->mLoaded ) {
 			return;
 		}
@@ -203,7 +201,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 
 	protected function beforeExecute( $subPage ) {
 		// finish initializing the class before processing the request - T135924
-		$this->loadRequestParameters( $subPage );
+		$this->loadRequestParameters();
 		return parent::beforeExecute( $subPage );
 	}
 
@@ -443,7 +441,9 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		}
 		if ( $extraMessages ) {
 			$extraMessages = Status::wrap( $extraMessages );
-			$out->addWikiTextAsInterface( $extraMessages->getWikiText() );
+			$out->addWikiTextAsInterface(
+				$extraMessages->getWikiText( false, false, $this->getLanguage() )
+			);
 		}
 
 		$out->addHTML( $injected_html );
@@ -977,7 +977,11 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 			}
 		}
 		if ( !$this->isSignup() && $this->showExtraInformation() ) {
-			$passwordReset = new PasswordReset( $this->getConfig(), AuthManager::singleton() );
+			$passwordReset = new PasswordReset(
+				$this->getConfig(),
+				AuthManager::singleton(),
+				MediaWikiServices::getInstance()->getPermissionManager()
+			);
 			if ( $passwordReset->isAllowed( $this->getUser() )->isGood() ) {
 				$fieldDefinitions['passwordReset'] = [
 					'type' => 'info',
@@ -1074,7 +1078,10 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	private function showCreateAccountLink() {
 		if ( $this->isSignup() ) {
 			return true;
-		} elseif ( $this->getUser()->isAllowed( 'createaccount' ) ) {
+		} elseif ( MediaWikiServices::getInstance()
+					->getPermissionManager()
+					->userHasRight( $this->getUser(), 'createaccount' )
+		) {
 			return true;
 		} else {
 			return false;