From 22476baa85bdb70c60d4dcf15cb24fecb1c07d5e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 5 Dec 2015 16:07:50 -0800 Subject: [PATCH] Remove obsolete category links code * These calls and methods should no longer be needed * Follow-up to 6dedffc2d7f8 Change-Id: Iff121263610117112c84edb5e575f039456d1ac8 --- includes/deferred/LinksUpdate.php | 12 ----------- includes/jobqueue/jobs/RefreshLinksJob.php | 24 ---------------------- 2 files changed, 36 deletions(-) diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php index f9d7e9c152..755a7cdcf8 100644 --- a/includes/deferred/LinksUpdate.php +++ b/includes/deferred/LinksUpdate.php @@ -61,9 +61,6 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate { /** @var bool Whether to queue jobs for recursive updates */ public $mRecursive; - /** @var bool Whether this job was triggered by a recursive update job */ - private $mTriggeredRecursive; - /** @var Revision Revision for which this update has been triggered */ private $mRevision; @@ -868,15 +865,6 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate { return $this->mImages; } - /** - * Set this object as being triggered by a recursive LinksUpdate - * - * @since 1.27 - */ - public function setTriggeredRecursive() { - $this->mTriggeredRecursive = true; - } - /** * Set the revision corresponding to this LinksUpdate * diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php index fa3278dfbf..031435214e 100644 --- a/includes/jobqueue/jobs/RefreshLinksJob.php +++ b/includes/jobqueue/jobs/RefreshLinksJob.php @@ -229,30 +229,6 @@ class RefreshLinksJob extends Job { $parserOutput ); - foreach ( $updates as $key => $update ) { - // FIXME: move category change RC stuff to a separate update. - // RC entry addition aborts if edits where since made, which is not necessary. - // It's also an SoC violation for links update code to care about RC. - if ( $update instanceof LinksUpdate ) { - if ( !empty( $this->params['triggeredRecursive'] ) ) { - $update->setTriggeredRecursive(); - } - if ( !empty( $this->params['triggeringUser'] ) ) { - $userInfo = $this->params['triggeringUser']; - if ( $userInfo['userId'] ) { - $user = User::newFromId( $userInfo['userId'] ); - } else { - // Anonymous, use the username - $user = User::newFromName( $userInfo['userName'], false ); - } - $update->setTriggeringUser( $user ); - } - if ( !empty( $this->params['triggeringRevisionId'] ) ) { - $update->setRevision( $revision ); - } - } - } - $latestNow = $page->lockAndGetLatest(); if ( !$latestNow || $revision->getId() != $latestNow ) { // Do not clobber over newer updates with older ones. If all jobs where FIFO and -- 2.20.1