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

Merge "ApiVisualEditor: Return structured block info as well as formatted notice"

Browse source
This commit is contained in:
jenkins-bot 2019-04-30 21:07:52 +00:00 committed by Gerrit Code Review
parent c1ee2f012f fae9fcb70c
commit 78a0b4ea0f
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
includes/ApiVisualEditor.php
View file

@ -487,27 +487,24 @@ class ApiVisualEditor extends ApiBase {
} }
} }
$block = null;
$blockinfo = null;
$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
// Blocked user notice // Blocked user notice
if ( $user->isBlockedFrom( $title, true ) || $user->isBlockedGlobally() ) { if ( $user->isBlockedGlobally() ) {
if ( $user->isBlockedFrom( $title, true ) ) { $block = $user->getGlobalBlock();
$notices[] = [ } elseif ( $permissionManager->isBlockedFrom( $user, $title, true ) ) {
'type' => 'block', $block = $user->getBlock();
'message' => call_user_func_array( }
[ $this, 'msg' ], if ( $block ) {
$user->getBlock()->getPermissionsError( $this->getContext() ) $notices[] = [
)->parseAsBlock(), 'type' => 'block',
]; 'message' => call_user_func_array(
} [ $this, 'msg' ],
$block->getPermissionsError( $this->getContext() )
if ( $user->isBlockedGlobally() ) { )->parseAsBlock(),
$notices[] = [ ];
'type' => 'block', $blockinfo = ApiQueryUserInfo::getBlockInfo( $block );
'message' => call_user_func_array(
[ $this, 'msg' ],
$user->getGlobalBlock()->getPermissionsError( $this->getContext() )
)->parseAsBlock(),
];
}
} }
// HACK: Build a fake EditPage so we can get checkboxes from it // HACK: Build a fake EditPage so we can get checkboxes from it
@ -566,7 +563,7 @@ class ApiVisualEditor extends ApiBase {
'basetimestamp' => $baseTimestamp, 'basetimestamp' => $baseTimestamp,
'starttimestamp' => wfTimestampNow(), 'starttimestamp' => wfTimestampNow(),
'oldid' => $oldid, 'oldid' => $oldid,
'blockinfo' => $blockinfo,
]; ];
if ( $params['paction'] === 'parse' || if ( $params['paction'] === 'parse' ||
$params['paction'] === 'wikitext' || $params['paction'] === 'wikitext' ||