Add triggeringRevisionId to LinksUpdate JobSpec

Bug: T117860
Change-Id: I8c730a434b8bdda7664fd1e3bb3fbc8840804950

diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index 9025736..7c6fbb9 100644 (file)
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -800,7 +800,6 @@ class RecentChange {
                $ip = '',
                $deleted = 0
        ) {
-
                $rc = new RecentChange;
                $rc->mTitle = $categoryTitle;
                $rc->mPerformer = $user;

diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php
index 9a24b96..dbfdab0 100644 (file)
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -1011,6 +1011,13 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
                } else {
                        $userInfo = false;
                }
+
+               if ( $this->mRevision ) {
+                       $triggeringRevisionId = $this->mRevision->getId();
+               } else {
+                       $triggeringRevisionId = false;
+               }
+
                return array(
                        'wiki' => $this->mDb->getWikiID(),
                        'job'  => new JobSpecification(
@@ -1020,6 +1027,7 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
                                        'rootJobTimestamp' => $this->mParserOutput->getCacheTime(),
                                        'useRecursiveLinksUpdate' => $this->mRecursive,
                                        'triggeringUser' => $userInfo,
+                                       'triggeringRevisionId' => $triggeringRevisionId,
                                ),
                                array( 'removeDuplicates' => true ),
                                $this->getTitle()

diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index 26f4520..25c3ba4 100644 (file)
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -229,6 +229,16 @@ class RefreshLinksJob extends Job {
                                        }
                                        $update->setTriggeringUser( $user );
                                }
+                               if ( isset( $this->params['triggeringRevisionId'] ) && $this->params['triggeringRevisionId'] ) {
+                                       $revision = Revision::newFromId( $this->params['triggeringRevisionId'] );
+                                       if ( $revision === null ) {
+                                               $revision = Revision::newFromId(
+                                                       $this->params['triggeringRevisionId'],
+                                                       Revision::READ_LATEST
+                                               );
+                                       }
+                                       $update->setRevision( $revision );
+                               }
                        }
                }