Merge "Rewrite pref cleanup script"

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

diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index c3f798f..af070c2 100644 (file)
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -975,7 +975,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 +1551,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 +1582,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
@@ -2131,7 +2134,7 @@ class AuthManager implements LoggerAwareInterface {
         * @param AuthenticationRequest[] &$reqs
         * @param string $action
         * @param string|null $username
-        * @param boolean $forceAction
+        * @param bool $forceAction
         */
        private function fillRequests( array &$reqs, $action, $username, $forceAction = false ) {
                foreach ( $reqs as $req ) {