From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 22 Sep 2015 01:17:36 +0000 (-0700)
Subject: jobqueue: A few small code cleanups to RefreshLinksJob
X-Git-Tag: 1.31.0-rc.0~9926
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=c3d9666051cc95ccd74c5282e68747b79d506baf;p=lhc%2Fweb%2Fwiklou.git

jobqueue: A few small code cleanups to RefreshLinksJob

Change-Id: Ia331e9dbf9d2be137c34a8c93ef2d6da8aad6c56
---

diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index dec944a80d..935d2fb114 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -111,9 +111,6 @@ class RefreshLinksJob extends Job {
 	 * @return bool
 	 */
 	protected function runForTitle( Title $title = null ) {
-		$linkCache = LinkCache::singleton();
-		$linkCache->clear();
-
 		if ( is_null( $title ) ) {
 			$this->setLastError( "refreshLinks: Invalid title" );
 			return false;
@@ -126,14 +123,18 @@ class RefreshLinksJob extends Job {
 			wfGetLB()->waitFor( $this->params['masterPos'] );
 		}
 
-		$page = WikiPage::factory( $title );
+		// Clear out title cache data from prior job transaction snapshots
+		$linkCache = LinkCache::singleton();
+		$linkCache->clear();
 
-		// Fetch the current revision...
+		// Fetch the current page and revision...
+		$page = WikiPage::factory( $title );
 		$revision = Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 		if ( !$revision ) {
 			$this->setLastError( "refreshLinks: Article not found {$title->getPrefixedDBkey()}" );
 			return false; // XXX: what if it was just deleted?
 		}
+
 		$content = $revision->getContent( Revision::RAW );
 		if ( !$content ) {
 			// If there is no content, pretend the content is empty