Update to MediaWiki 1.24.1

1 files changed, 14 insertions, 8 deletions

diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index bfe04d79..08be5537 100644
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -34,9 +34,15 @@ require_once __DIR__ . '/Maintenance.php';
 class ResetUserTokens extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Reset the user_token of all users on the wiki. Note that this may log some of them out.";
+		$this->mDescription =
+			"Reset the user_token of all users on the wiki. Note that this may log some of them out.";
 		$this->addOption( 'nowarn', "Hides the 5 seconds warning", false, false );
-		$this->addOption( 'nulls', 'Only reset tokens that are currently null (string of \x00\'s)', false, false );
+		$this->addOption(
+			'nulls',
+			'Only reset tokens that are currently null (string of \x00\'s)',
+			false,
+			false
+		);
 		$this->setBatchSize( 1000 );
 	}
 
@@ -45,14 +51,16 @@ class ResetUserTokens extends Maintenance {
 
 		if ( !$this->getOption( 'nowarn' ) ) {
 			if ( $this->nullsOnly ) {
-				$this->output( "The script is about to reset the user_token for USERS WITH NULL TOKENS in the database.\n" );
+				$this->output( "The script is about to reset the user_token "
+					. "for USERS WITH NULL TOKENS in the database.\n" );
 			} else {
 				$this->output( "The script is about to reset the user_token for ALL USERS in the database.\n" );
 				$this->output( "This may log some of them out and is not necessary unless you believe your\n" );
 				$this->output( "user table has been compromised.\n" );
 			}
 			$this->output( "\n" );
-			$this->output( "Abort with control-c in the next five seconds (skip this countdown with --nowarn) ... " );
+			$this->output( "Abort with control-c in the next five seconds "
+				. "(skip this countdown with --nowarn) ... " );
 			wfCountDown( 5 );
 		}
 
@@ -62,7 +70,7 @@ class ResetUserTokens extends Maintenance {
 		$where = array();
 		if ( $this->nullsOnly ) {
 			// Have to build this by hand, because \ is escaped in helper functions
-			$where = array( 'user_token = \'' . str_repeat( '\0', 32) . '\'' );
+			$where = array( 'user_token = \'' . str_repeat( '\0', 32 ) . '\'' );
 		}
 
 		$maxid = $dbr->selectField( 'user', 'MAX(user_id)', array(), __METHOD__ );
@@ -90,9 +98,7 @@ class ResetUserTokens extends Maintenance {
 			$max = $min + $this->mBatchSize;
 
 			wfWaitForSlaves();
-
-		} while ( $max <= $maxid );
-
+		} while ( $min <= $maxid );
 	}
 
 	private function updateUser( $userid ) {