X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FresetUserTokens.php;h=481da980da02e0a8074a801b304afa0ec08602c0;hb=7a836958be6a698a61eef4d166d9fecd7a909e8d;hp=9c7aef29dba02a8d7b3a08abd701a6db419a0d82;hpb=f875f3d31867067116641af987dea4511324e96b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index 9c7aef29db..481da980da 100644
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -30,12 +30,15 @@ require_once __DIR__ . '/Maintenance.php';
  * Maintenance script to reset the user_token for all users on the wiki.
  *
  * @ingroup Maintenance
+ * @deprecated since 1.27, use $wgAuthenticationTokenVersion instead.
  */
 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->addDescription(
+			"Reset the user_token of all users on the wiki. Note that this may log some of them out.\n"
+			. "Deprecated, use \$wgAuthenticationTokenVersion instead."
+		);
 		$this->addOption( 'nowarn', "Hides the 5 seconds warning", false, false );
 		$this->addOption(
 			'nulls',
@@ -64,28 +67,29 @@ class ResetUserTokens extends Maintenance {
 			wfCountDown( 5 );
 		}
 
+		// We list user by user_id from one of the replica DBs
 		// We list user by user_id from one of the slave database
-		$dbr = $this->getDB( DB_SLAVE );
+		$dbr = $this->getDB( DB_REPLICA );
 
-		$where = array();
+		$where = [];
 		if ( $this->nullsOnly ) {
 			// Have to build this by hand, because \ is escaped in helper functions
-			$where = array( 'user_token = \'' . str_repeat( '\0', 32 ) . '\'' );
+			$where = [ 'user_token = \'' . str_repeat( '\0', 32 ) . '\'' ];
 		}
 
-		$maxid = $dbr->selectField( 'user', 'MAX(user_id)', array(), __METHOD__ );
+		$maxid = $dbr->selectField( 'user', 'MAX(user_id)', [], __METHOD__ );
 
 		$min = 0;
 		$max = $this->mBatchSize;
 
 		do {
 			$result = $dbr->select( 'user',
-				array( 'user_id' ),
+				[ 'user_id' ],
 				array_merge(
 					$where,
-					array( 'user_id > ' . $dbr->addQuotes( $min ),
+					[ 'user_id > ' . $dbr->addQuotes( $min ),
 						'user_id <= ' . $dbr->addQuotes( $max )
-					)
+					]
 				),
 				__METHOD__
 			);