Merge "Don't throw an exception when waiting for replication times out"

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

diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index 45e9684..e94f3db 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.
@@ -1062,7 +1063,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
                                        // 'id' => 'mw-userlogin-help', // FIXME HTMLInfoField ignores this
                                        'raw' => true,
                                        'default' => Html::element( 'a', [
-                                               'href' => Skin::makeInternalOrExternalUrl( wfMessage( 'helplogin-url' )
+                                               'href' => Skin::makeInternalOrExternalUrl( $this->msg( 'helplogin-url' )
                                                        ->inContentLanguage()
                                                        ->text() ),
                                        ], $this->msg( 'userlogin-helplink2' )->text() ),
@@ -1491,7 +1492,7 @@ class LoginForm extends SpecialPage {
        ];
 
        /**
-        * @param WebRequest $request
+        * @param WebRequest|null $request
         */
        public function __construct( $request = null ) {
                wfDeprecated( 'LoginForm', '1.27' );