Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check EmailConfirmToEdit in checkActionPermissions

Browse source 
The check for EmailConfirmToEdit was previously implemented in checkUserBlock()
for reasons lost in the mist of time,
<see https://static-codereview.wikimedia.org/MediaWiki/65504.html>.

Change-Id: Ida1ef71f9c69f7d62345e8e265de349601e8923d
This commit is contained in:
daniel 2023-09-08 11:58:42 +02:00 committed by Tim Starling
parent c760ca4749
commit e2acdf4793
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/Permissions/PermissionManager.php
View file

@ -833,13 +833,6 @@ class PermissionManager {
$short,
LinkTarget $page
): array {
if ( $action === 'edit'
&& $this->options->get( MainConfigNames::EmailConfirmToEdit )
&& !$user->isEmailConfirmed()
) {
$errors[] = [ 'confirmedittext' ];
}
$block = $this->getApplicableBlock(
$action,
$user,
@ -1286,6 +1279,12 @@ class PermissionManager {
$errors[] = [ 'undelete-cantcreate' ];
}
} elseif ( $action === 'edit' ) {
if ( $this->options->get( MainConfigNames::EmailConfirmToEdit )
&& !$user->isEmailConfirmed()
) {
$errors[] = [ 'confirmedittext' ];
}
if ( !$title->exists() ) {
$errors = array_merge(
$errors,