From 549bfc0ee5c83224c80ddad4970548092b4ffdbf Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 25 May 2015 11:29:34 -0700
Subject: [PATCH] Fixed regression from 97b2a1dfd with URL specified edit tags

Bug: T100248
Change-Id: I2688356cd5f628dca395d1caaa82b9a5b21c025e
---
 includes/EditPage.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/includes/EditPage.php b/includes/EditPage.php
index b0da562394..e88baafe56 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1958,11 +1958,13 @@ class EditPage {
 
 		if ( $this->changeTags && isset( $doEditStatus->value['revision'] ) ) {
 			// If a revision was created, apply any change tags that were requested
-			ChangeTags::addTags(
-				$this->changeTags,
-				isset( $doEditStatus->value['rc'] ) ? $doEditStatus->value['rc']->mAttribs['rc_id'] : null,
-				$doEditStatus->value['revision']->getId()
-			);
+			$addTags = $this->changeTags;
+			$revId = $doEditStatus->value['revision']->getId();
+			// Defer this both for performance and so that addTags() sees the rc_id
+			// since the recentchange entry addition is deferred first (bug T100248)
+			DeferredUpdates::addCallableUpdate( function() use ( $addTags, $revId ) {
+				ChangeTags::addTags( $addTags, null, $revId );
+			} );
 		}
 
 		return $status;
-- 
2.20.1