update to MediaWiki 1.17.0

1 files changed, 20 insertions, 21 deletions

diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php
index bf81cb68..387f5a56 100644
--- a/maintenance/populateParentId.php
+++ b/maintenance/populateParentId.php
@@ -22,7 +22,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class PopulateParentId extends Maintenance {
 	public function __construct() {
@@ -39,7 +39,7 @@ class PopulateParentId extends Maintenance {
 		$this->output( "Populating rev_parent_id column\n" );
 		$start = $db->selectField( 'revision', 'MIN(rev_id)', false, __FUNCTION__ );
 		$end = $db->selectField( 'revision', 'MAX(rev_id)', false, __FUNCTION__ );
-		if( is_null( $start ) || is_null( $end ) ){
+		if ( is_null( $start ) || is_null( $end ) ) {
 			$this->output( "...revision table seems to be empty.\n" );
 			$db->insert( 'updatelog',
 				array( 'ul_key' => 'populate rev_parent_id' ),
@@ -48,47 +48,46 @@ class PopulateParentId extends Maintenance {
 			return;
 		}
 		# Do remaining chunk
-		$end += $this->mBatchSize - 1;
 		$blockStart = intval( $start );
 		$blockEnd = intval( $start ) + $this->mBatchSize - 1;
 		$count = 0;
 		$changed = 0;
-		while( $blockEnd <= $end ) {
+		while ( $blockStart <= $end ) {
 			$this->output( "...doing rev_id from $blockStart to $blockEnd\n" );
 			$cond = "rev_id BETWEEN $blockStart AND $blockEnd";
-			$res = $db->select( 'revision', 
-				array('rev_id','rev_page','rev_timestamp','rev_parent_id'), 
+			$res = $db->select( 'revision',
+				array( 'rev_id', 'rev_page', 'rev_timestamp', 'rev_parent_id' ),
 				$cond, __METHOD__ );
 			# Go through and update rev_parent_id from these rows.
 			# Assume that the previous revision of the title was
 			# the original previous revision of the title when the
 			# edit was made...
-			foreach( $res as $row ) {
+			foreach ( $res as $row ) {
 				# First, check rows with the same timestamp other than this one
 				# with a smaller rev ID. The highest ID "wins". This avoids loops
 				# as timestamp can only decrease and never loops with IDs (from parent to parent)
-				$previousID = $db->selectField( 'revision', 'rev_id', 
+				$previousID = $db->selectField( 'revision', 'rev_id',
 					array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $row->rev_timestamp,
-						"rev_id < " . intval( $row->rev_id ) ), 
+						"rev_id < " . intval( $row->rev_id ) ),
 					__METHOD__,
 					array( 'ORDER BY' => 'rev_id DESC' ) );
 				# If there are none, check the the highest ID with a lower timestamp
-				if( !$previousID ) {
+				if ( !$previousID ) {
 					# Get the highest older timestamp
-					$lastTimestamp = $db->selectField( 'revision', 'rev_timestamp', 
-						array( 'rev_page' => $row->rev_page, "rev_timestamp < " . $db->addQuotes( $row->rev_timestamp ) ), 
+					$lastTimestamp = $db->selectField( 'revision', 'rev_timestamp',
+						array( 'rev_page' => $row->rev_page, "rev_timestamp < " . $db->addQuotes( $row->rev_timestamp ) ),
 						__METHOD__,
 						array( 'ORDER BY' => 'rev_timestamp DESC' ) );
 					# If there is one, let the highest rev ID win
-					if( $lastTimestamp ) {
-						$previousID = $db->selectField( 'revision', 'rev_id', 
-							array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $lastTimestamp ), 
+					if ( $lastTimestamp ) {
+						$previousID = $db->selectField( 'revision', 'rev_id',
+							array( 'rev_page' => $row->rev_page, 'rev_timestamp' => $lastTimestamp ),
 							__METHOD__,
 							array( 'ORDER BY' => 'rev_id DESC' ) );
 					}
 				}
-				$previousID = intval($previousID);
-				if( $previousID != $row->rev_parent_id )
+				$previousID = intval( $previousID );
+				if ( $previousID != $row->rev_parent_id )
 					$changed++;
 				# Update the row...
 				$db->update( 'revision',
@@ -97,15 +96,15 @@ class PopulateParentId extends Maintenance {
 					__METHOD__ );
 				$count++;
 			}
-			$blockStart += $this->mBatchSize - 1;
-			$blockEnd += $this->mBatchSize - 1;
+			$blockStart += $this->mBatchSize;
+			$blockEnd += $this->mBatchSize;
 			wfWaitForSlaves( 5 );
 		}
 		$logged = $db->insert( 'updatelog',
 			array( 'ul_key' => 'populate rev_parent_id' ),
 			__METHOD__,
 			'IGNORE' );
-		if( $logged ) {
+		if ( $logged ) {
 			$this->output( "rev_parent_id population complete ... {$count} rows [{$changed} changed]\n" );
 			return true;
 		} else {
@@ -116,4 +115,4 @@ class PopulateParentId extends Maintenance {
 }
 
 $maintClass = "PopulateParentId";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );