Merge "Simplify HTMLTitleTextField::validate"

[lhc/web/wiklou.git] / includes / specialpage / LoginSignupSpecialPage.php

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index d5c889a..e39ec58 100644 (file)
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -265,6 +265,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
                         $this->getUser()->isLoggedIn()
                ) {
                        $this->successfulAction();
+                       return;
                }
 
                // If logging in and not on HTTPS, either redirect to it or offer a link.
@@ -610,7 +611,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
                        $benefitList = '';
                        for ( $benefitIdx = 1; $benefitIdx <= $benefitCount; $benefitIdx++ ) {
                                $headUnescaped = $this->msg( "createacct-benefit-head$benefitIdx" )->text();
-                               $iconClass = $this->msg( "createacct-benefit-icon$benefitIdx" )->escaped();
+                               $iconClass = $this->msg( "createacct-benefit-icon$benefitIdx" )->text();
                                $benefitList .= Html::rawElement( 'div', [ 'class' => "mw-number-text $iconClass" ],
                                        Html::rawElement( 'h3', [],
                                                $this->msg( "createacct-benefit-head$benefitIdx" )->escaped()
@@ -1126,7 +1127,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
                        if ( !$signupendMsg->isDisabled() ) {
                                $usingHTTPS = $this->getRequest()->getProtocol() === 'https';
                                $signupendText = ( $usingHTTPS && !$signupendHttpsMsg->isBlank() )
-                                       ? $signupendHttpsMsg ->parse() : $signupendMsg->parse();
+                                       ? $signupendHttpsMsg->parse() : $signupendMsg->parse();
                                $fieldDefinitions['signupend'] = [
                                        'type' => 'info',
                                        'raw' => true,