From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 17 Mar 2015 02:33:25 +0000 (-0700)
Subject: Fixed timestamp comparison in fixUserRegistration
X-Git-Tag: 1.31.0-rc.0~12067^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=88eab303d48549a618cef06da86a58a5c6d73faa;p=lhc%2Fweb%2Fwiklou.git

Fixed timestamp comparison in fixUserRegistration

* Also optimized batching logic slightly

Change-Id: I0cedb5b39f996b7baec067890f230cff51468e4b
---

diff --git a/maintenance/fixUserRegistration.php b/maintenance/fixUserRegistration.php
index 0120f353f5..43f4b6c0eb 100644
--- a/maintenance/fixUserRegistration.php
+++ b/maintenance/fixUserRegistration.php
@@ -66,7 +66,7 @@ class FixUserRegistration extends Maintenance {
 					__METHOD__
 				);
 				// Update
-				if ( $timestamp !== false ) {
+				if ( $timestamp !== null ) {
 					$dbw->update(
 						'user',
 						array( 'user_registration' => $timestamp ),
@@ -83,7 +83,7 @@ class FixUserRegistration extends Maintenance {
 			$this->output( "Waiting for slaves..." );
 			wfWaitForSlaves();
 			$this->output( " done.\n" );
-		} while ( $res->numRows() );
+		} while ( $res->numRows() >= $this->mBatchSize );
 	}
 }