Merge "Remove $wgAuth usage from wrapOldPasswords.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Nov 2017 14:21:33 +0000 (14:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Nov 2017 14:21:34 +0000 (14:21 +0000)
1  2 
maintenance/wrapOldPasswords.php

@@@ -43,12 -43,6 +43,6 @@@ class WrapOldPasswords extends Maintena
        }
  
        public function execute() {
-               global $wgAuth;
-               if ( !$wgAuth->allowSetLocalPassword() ) {
-                       $this->error( '$wgAuth does not allow local passwords. Aborting.', true );
-               }
                $passwordFactory = new PasswordFactory();
                $passwordFactory->init( RequestContext::getMain()->getConfig() );
  
@@@ -87,7 -81,7 +81,7 @@@
                                __METHOD__,
                                [
                                        'ORDER BY' => 'user_id',
 -                                      'LIMIT' => $this->mBatchSize,
 +                                      'LIMIT' => $this->getBatchSize(),
                                        'LOCK IN SHARE MODE',
                                ]
                        );