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

Merge "ApiVisualEditor.php: Add notices also when not blocked"

Browse source
This commit is contained in:
jenkins-bot 2020-01-16 23:29:36 +00:00 committed by Gerrit Code Review
parent 6d5b9c31dd a01f28c8a3
commit 523e9379c2
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
includes/ApiVisualEditor.php
View file

@ -539,6 +539,14 @@ class ApiVisualEditor extends ApiBase {
} }
} }
// Simplified EditPage::getEditPermissionErrors()
// Will be false e.g. if user is blocked or page is protected
$editPermErrors = $title->getUserPermissionsErrors( 'edit', $user, 'full' );
$canEdit = !(
$editPermErrors ||
( !$title->exists() && $title->getUserPermissionsErrors( 'create', $user, 'full' ) )
);
$block = null; $block = null;
$blockinfo = null; $blockinfo = null;
$permissionManager = MediaWikiServices::getInstance()->getPermissionManager(); $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
@ -558,15 +566,14 @@ class ApiVisualEditor extends ApiBase {
]; ];
$blockinfo = $this->getBlockDetails( $block ); $blockinfo = $this->getBlockDetails( $block );
} elseif ( $editPermErrors ) {
// For cases where the user is not blocked but has not permission to edit. (e.g. T241693)
$notices[] = $this->msg(
'permissionserrorstext-withaction', 1,
$this->msg( $title->exists() ? 'action-edit' : 'action-createpage' )
) . "<br>" . call_user_func_array( [ $this, 'msg' ], $editPermErrors[0] )->parse();
} }
// Simplified EditPage::getEditPermissionErrors()
// Will be false e.g. if user is blocked or page is protected
$canEdit = !(
$title->getUserPermissionsErrors( 'edit', $user, 'full' ) ||
( !$title->exists() && $title->getUserPermissionsErrors( 'create', $user, 'full' ) )
);
// HACK: Build a fake EditPage so we can get checkboxes from it // HACK: Build a fake EditPage so we can get checkboxes from it
// Deliberately omitting ,0 so oldid comes from request // Deliberately omitting ,0 so oldid comes from request
$article = new Article( $title ); $article = new Article( $title );