wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-23 22:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove usage of User::isBlockedGlobally and User::getGlobalBlock"

Browse source
This commit is contained in:
jenkins-bot 2022-11-16 15:22:09 +00:00 committed by Gerrit Code Review
parent f805005145 4bdb4917f0
commit a584e73975
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

@ -24,7 +24,7 @@
"license-name": "MIT", "license-name": "MIT",
"type": "editor", "type": "editor",
"requires": { "requires": {
"MediaWiki": ">= 1.39.0" "MediaWiki": ">= 1.40.0"
}, },
"callback": "MediaWiki\\Extension\\VisualEditor\\Hooks::onRegistration", "callback": "MediaWiki\\Extension\\VisualEditor\\Hooks::onRegistration",
"ServiceWiringFiles": [ "ServiceWiringFiles": [

4
includes/ApiVisualEditor.php
View file

@ -581,9 +581,7 @@ class ApiVisualEditor extends ApiBase {
$block = null; $block = null;
$blockinfo = null; $blockinfo = null;
// Blocked user notice // Blocked user notice
if ( $user->isBlockedGlobally() ) { if ( $permissionManager->isBlockedFrom( $user, $title, true ) ) {
$block = $user->getGlobalBlock();
} elseif ( $permissionManager->isBlockedFrom( $user, $title, true ) ) {
$block = $user->getBlock(); $block = $user->getBlock();
} }
if ( $block ) { if ( $block ) {