Merge "Contributions: Only add form JS when the form is added"

[lhc/web/wiklou.git] / includes / auth / AuthManager.php

diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index b2528fe..47c0df5 100644 (file)
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -31,6 +31,7 @@ use Status;
 use StatusValue;
 use User;
 use WebRequest;
+use Wikimedia\ObjectFactory;
 
 /**
  * This serves as the entry point to the authentication system.
@@ -975,7 +976,7 @@ class AuthManager implements LoggerAwareInterface {
        public function checkAccountCreatePermissions( User $creator ) {
                // Wiki is read-only?
                if ( wfReadOnly() ) {
-                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
+                       return Status::newFatal( wfMessage( 'readonlytext', wfReadOnlyReason() ) );
                }
 
                // This is awful, this permission check really shouldn't go through Title.
@@ -1551,7 +1552,10 @@ class AuthManager implements LoggerAwareInterface {
                // Fetch the user ID from the master, so that we don't try to create the user
                // when they already exist, due to replication lag
                // @codeCoverageIgnoreStart
-               if ( !$localId && wfGetLB()->getReaderIndex() != 0 ) {
+               if (
+                       !$localId &&
+                       MediaWikiServices::getInstance()->getDBLoadBalancer()->getReaderIndex() != 0
+               ) {
                        $localId = User::idFromName( $username, User::READ_LATEST );
                        $flags = User::READ_LATEST;
                }
@@ -1579,7 +1583,7 @@ class AuthManager implements LoggerAwareInterface {
                        ] );
                        $user->setId( 0 );
                        $user->loadFromId();
-                       return Status::newFatal( 'readonlytext', wfReadOnlyReason() );
+                       return Status::newFatal( wfMessage( 'readonlytext', wfReadOnlyReason() ) );
                }
 
                // Check the session, if we tried to create this user already there's
@@ -2289,7 +2293,7 @@ class AuthManager implements LoggerAwareInterface {
 
                $ret = [];
                foreach ( $specs as $spec ) {
-                       $provider = \ObjectFactory::getObjectFromSpec( $spec );
+                       $provider = ObjectFactory::getObjectFromSpec( $spec );
                        if ( !$provider instanceof $class ) {
                                throw new \RuntimeException(
                                        "Expected instance of $class, got " . get_class( $provider )