X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Frebuildrecentchanges.php;h=458dacf56d0b3468afc815b58ef0ebf294b1abac;hb=24ebca2251f94a20acee53e583d65aa7fac2c15d;hp=6465bb32faab980769592b02018cec69dccc1fb1;hpb=83691ed06e8ec7ef1f6f7290b8c5c175ab9f4928;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 6465bb32fa..5df432eb7a 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -24,6 +24,7 @@
  */
 
 require_once __DIR__ . '/Maintenance.php';
+use MediaWiki\MediaWikiServices;
 
 /**
  * Maintenance script that rebuilds recent changes from scratch.
@@ -155,9 +156,7 @@ class RebuildRecentchanges extends Maintenance {
 					'rc_this_oldid' => $row->rev_id,
 					'rc_last_oldid' => 0, // is this ok?
 					'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT,
-					'rc_source' => $row->page_is_new
-						? $dbw->addQuotes( RecentChange::SRC_NEW )
-						: $dbw->addQuotes( RecentChange::SRC_EDIT )
+					'rc_source' => $row->page_is_new ? RecentChange::SRC_NEW : RecentChange::SRC_EDIT
 					,
 					'rc_deleted' => $row->rev_deleted
 				],
@@ -238,9 +237,7 @@ class RebuildRecentchanges extends Maintenance {
 						'rc_last_oldid' => $lastOldId,
 						'rc_new' => $new,
 						'rc_type' => $new ? RC_NEW : RC_EDIT,
-						'rc_source' => $new === 1
-							? $dbw->addQuotes( RecentChange::SRC_NEW )
-							: $dbw->addQuotes( RecentChange::SRC_EDIT ),
+						'rc_source' => $new === 1 ? RecentChange::SRC_NEW : RecentChange::SRC_EDIT,
 						'rc_old_len' => $lastSize,
 						'rc_new_len' => $size,
 					],
@@ -304,6 +301,8 @@ class RebuildRecentchanges extends Maintenance {
 			]
 		);
 
+		$field = $dbw->fieldInfo( 'recentchanges', 'rc_cur_id' );
+
 		$inserted = 0;
 		foreach ( $res as $row ) {
 			$dbw->insert(
@@ -322,8 +321,8 @@ class RebuildRecentchanges extends Maintenance {
 					'rc_this_oldid' => 0,
 					'rc_last_oldid' => 0,
 					'rc_type' => RC_LOG,
-					'rc_source' => $dbw->addQuotes( RecentChange::SRC_LOG ),
-					'rc_cur_id' => $dbw->cascadingDeletes()
+					'rc_source' => RecentChange::SRC_LOG,
+					'rc_cur_id' => $field->isNullable()
 						? $row->page_id
 						: (int)$row->page_id, // NULL => 0,
 					'rc_log_type' => $row->log_type,
@@ -476,15 +475,16 @@ class RebuildRecentchanges extends Maintenance {
 	}
 
 	/**
-	 * Purge cached feeds in $messageMemc
+	 * Purge cached feeds in $wanCache
 	 */
 	private function purgeFeeds() {
-		global $wgFeedClasses, $messageMemc;
+		global $wgFeedClasses;
 
 		$this->output( "Deleting feed timestamps.\n" );
 
+		$wanCache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		foreach ( $wgFeedClasses as $feed => $className ) {
-			$messageMemc->delete( wfMemcKey( 'rcfeed', $feed, 'timestamp' ) ); # Good enough for now.
+			$wanCache->delete( $wanCache->makeKey( 'rcfeed', $feed, 'timestamp' ) ); # Good enough for now.
 		}
 	}
 }