jenkins-bot has submitted this change and it was merged.
Change subject: Fixed regression from 97b2a1dfd with URL specified edit tags
......................................................................
Fixed regression from 97b2a1dfd with URL specified edit tags
Bug: T100248
Change-Id: I2688356cd5f628dca395d1caaa82b9a5b21c025e
(cherry picked from commit 549bfc0ee5c83224c80ddad4970548092b4ffdbf)
---
M includes/EditPage.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/EditPage.php b/includes/EditPage.php
index b0da562..e88baaf 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1958,11 +1958,13 @@
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;
--
To view, visit https://gerrit.wikimedia.org/r/214389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2688356cd5f628dca395d1caaa82b9a5b21c025e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf7
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
