Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/234197
Change subject: Defer spreadAnyEditBlock() post-send ...................................................................... Defer spreadAnyEditBlock() post-send * No need for these to be perfectly synchronous Bug: T92357 Change-Id: I6863960c8170ef4c3f2e356841b4086ac98f0f03 --- M includes/EditPage.php M includes/specials/SpecialMovepage.php 2 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/97/234197/1 diff --git a/includes/EditPage.php b/includes/EditPage.php index f3a41c4..85a3014 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -527,7 +527,10 @@ if ( $permErrors ) { wfDebug( __METHOD__ . ": User can't edit\n" ); // Auto-block user's IP if the account was "hard" blocked - $wgUser->spreadAnyEditBlock(); + $user = $wgUser; + DeferredUpdates::addCallableUpdate( function() use ( $user ) { + $user->spreadAnyEditBlock(); + } ); $this->displayPermissionsError( $permErrors ); diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index e77479f..eb8a274 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -104,7 +104,9 @@ $permErrors = $this->oldTitle->getUserPermissionsErrors( 'move', $user ); if ( count( $permErrors ) ) { // Auto-block user's IP if the account was "hard" blocked - $user->spreadAnyEditBlock(); + DeferredUpdates::addCallableUpdate( function() use ( $user ) { + $user->spreadAnyEditBlock(); + } ); throw new PermissionsError( 'move', $permErrors ); } -- To view, visit https://gerrit.wikimedia.org/r/234197 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6863960c8170ef4c3f2e356841b4086ac98f0f03 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits