X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Frebuildrecentchanges.php;h=4e92653abca9ced21d5e345b1c66584a61d6f0f6;hb=c1bfb7d319766cf46877459b2149a66ac7099295;hp=471c7aedd78f189f5ba12902cbb3429bf9a8934f;hpb=a14133e55c0d4bceca030a9bdb373f3ff84c15ed;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 471c7aedd7..4e92653abc 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -221,7 +221,7 @@ class RebuildRecentchanges extends Maintenance {
 				} else {
 					# No previous edit
 					$lastOldId = 0;
-					$lastSize = null;
+					$lastSize = 0;
 					$new = 1; // probably true
 				}
 			}
@@ -277,17 +277,17 @@ class RebuildRecentchanges extends Maintenance {
 			array_keys( $wgFilterLogTypes ),
 			[ 'create' ] );
 
-		$this->output( "Loading from user, page, and logging tables...\n" );
+		$this->output( "Loading from user and logging tables...\n" );
 
 		$commentQuery = $commentStore->getJoin( 'log_comment' );
 		$actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' );
 		$res = $dbw->select(
-			[ 'logging', 'page' ] + $commentQuery['tables'] + $actorQuery['tables'],
+			[ 'logging' ] + $commentQuery['tables'] + $actorQuery['tables'],
 			[
 				'log_timestamp',
 				'log_namespace',
 				'log_title',
-				'page_id',
+				'log_page',
 				'log_type',
 				'log_action',
 				'log_id',
@@ -302,10 +302,7 @@ class RebuildRecentchanges extends Maintenance {
 			],
 			__METHOD__,
 			[ 'ORDER BY' => 'log_timestamp DESC' ],
-			[
-				'page' =>
-					[ 'LEFT JOIN', [ 'log_namespace=page_namespace', 'log_title=page_title' ] ]
-			] + $commentQuery['joins'] + $actorQuery['joins']
+			$commentQuery['joins'] + $actorQuery['joins']
 		);
 
 		$field = $dbw->fieldInfo( 'recentchanges', 'rc_cur_id' );
@@ -330,8 +327,8 @@ class RebuildRecentchanges extends Maintenance {
 					'rc_type' => RC_LOG,
 					'rc_source' => RecentChange::SRC_LOG,
 					'rc_cur_id' => $field->isNullable()
-						? $row->page_id
-						: (int)$row->page_id, // NULL => 0,
+						? $row->log_page
+						: (int)$row->log_page, // NULL => 0,
 					'rc_log_type' => $row->log_type,
 					'rc_log_action' => $row->log_action,
 					'rc_logid' => $row->log_id,
@@ -375,7 +372,7 @@ class RebuildRecentchanges extends Maintenance {
 				[ 'ug_group' => $botgroups ],
 				__METHOD__,
 				[ 'DISTINCT' ],
-				[ 'user_group' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
+				[ 'user_groups' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
 			);
 
 			$botusers = [];
@@ -428,7 +425,7 @@ class RebuildRecentchanges extends Maintenance {
 				[ 'ug_group' => $autopatrolgroups ],
 				__METHOD__,
 				[ 'DISTINCT' ],
-				[ 'user_group' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
+				[ 'user_groups' => [ 'JOIN', 'user_id = ug_user' ] ] + $userQuery['joins']
 			);
 
 			foreach ( $res as $obj ) {