Following T257701: Add global blocks into CompositeBlocks rather than treating them separately
Remove usage of User::isBlockedGlobally and User::getGlobalBlock in FileImporter
Usage of User::isBlockedGlobally found here
Usage of User::getGlobalBlock found here
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Open | None | T231109 Remove Core coupling with GlobalBlocking extension | |||
| Open | None | T319069 Remove global-blocks-specific methods and hook from User class | |||
| Open | Spike | None | T315644 Global blocks should be treated as a subtype of blocks | ||
| Resolved | Cyndymediawiksim | T317337 Deprecate global-blocks-specific methods and hook | |||
| Resolved | • TThoabala | T317342 Investigate: Remove use of User::isBlockedGlobally and User::getGlobalBlock from Wikimedia deployed extensions | |||
| Resolved | WMDE-Fisch | T318893 Remove use of User::isBlockedGlobally and User::getGlobalBlock in FileImporter | |||
| Resolved | • Tchanders | T257701 Add global blocks into CompositeBlocks rather than treating them separately | |||
| Resolved | • Tchanders | T317308 GlobalBlocking should specify block error message key | |||
| Resolved | • AGueyte | T317201 Allow extensions to modify block error message key via a hook | |||
| Resolved | STran | T317190 GlobalBlock should extend AbstractBlock instead of DatabaseBlock |
Change 841474 had a related patch set uploaded (by WMDE-Fisch; author: WMDE-Fisch):
[mediawiki/extensions/FileImporter@master] Use GlobalBlocking::getUserBlock instead of User::isGloballyBlocked
Change 841476 had a related patch set uploaded (by WMDE-Fisch; author: WMDE-Fisch):
[integration/config@master] Add GlobalBlocking phan dependency for FileImporter
Change 841476 merged by jenkins-bot:
[integration/config@master] Add GlobalBlocking phan dependency for FileImporter
Change 841474 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Use GlobalBlocking::getUserBlock instead of User::isGloballyBlocked
As @dom_walden noted, we could remove this dependency on GlobalBlocking again, once T257701: Add global blocks into CompositeBlocks rather than treating them separately is done, since User::getBlock will get global blocks too.
@TThoabala Would you mind filing a follow-up task and linking that here? Thanks!
I checked that a blocked IP cannot see Special:ImportFile, and sees instead the MediaWiki:Blockedtext message.
https://commons.wikimedia.beta.wmflabs.org FileImporter – (f35ded3) 06:19, 19 October 2022. GlobalBlocking – (5b7ad2d) 06:19, 19 October 2022.
Thanks @Tchanders, I have filled a follow up task here https://phabricator.wikimedia.org/T321240
I guess this is done and the follow up covers for remaining work? If not, feel free to re-open.