From a072e254a5442328cf6449b4e4722e51259c7c4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Sat, 25 Aug 2018 01:02:26 +0200 Subject: [PATCH] Restore passing of triggering user in edit updates Bug: T200119 Change-Id: I14102a15aa93d1f909c5b347f5dd589f87c2e500 --- includes/Storage/DerivedPageDataUpdater.php | 17 ++++++----------- includes/page/WikiPage.php | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php index a00766fa74..dacec96f99 100644 --- a/includes/Storage/DerivedPageDataUpdater.php +++ b/includes/Storage/DerivedPageDataUpdater.php @@ -1408,21 +1408,16 @@ class DerivedPageDataUpdater implements IDBAccessObject { $recursive = $this->options['changed']; // T52785 $updates = $this->getSecondaryDataUpdates( $recursive ); + $triggeringUser = $this->options['triggeringuser'] ?? $this->user; + if ( !$triggeringUser instanceof User ) { + $triggeringUser = User::newFromIdentity( $triggeringUser ); + } foreach ( $updates as $update ) { // TODO: make an $option field for the cause - $update->setCause( 'edit-page', $this->user->getName() ); + $update->setCause( 'edit-page', $triggeringUser->getName() ); if ( $update instanceof LinksUpdate ) { $update->setRevision( $legacyRevision ); - - if ( !empty( $this->options['triggeringuser'] ) ) { - /** @var UserIdentity|User $triggeringUser */ - $triggeringUser = $this->options['triggeringuser']; - if ( !$triggeringUser instanceof User ) { - $triggeringUser = User::newFromIdentity( $triggeringUser ); - } - - $update->setTriggeringUser( $triggeringUser ); - } + $update->setTriggeringUser( $triggeringUser ); } DeferredUpdates::addUpdate( $update ); } diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 147c9f311d..ba2d511978 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -1961,7 +1961,7 @@ class WikiPage implements Page, IDBAccessObject { * Purges pages that include this page if the text was changed here. * Every 100th edit, prune the recent changes table. * - * @deprecated since 1.32, use PageUpdater::doEditUpdates instead. + * @deprecated since 1.32, use PageUpdater::doUpdates instead. * * @param Revision $revision * @param User $user User object that did the revision -- 2.20.1