golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix: check if user is blocked to show edit button" 

The merged patch hid the edit icon completely for blocked users.
It should not do this but should show. I've updated the task
description to explain this behaviour better.

This reverts commit cb6bde03dd.

Bug: T190834
Change-Id: I28b2a6bfb1d0501668752faaf4cbd2ea8bf3398a
This commit is contained in:
Jdlrobson 2018-04-05 22:23:14 +00:00
parent cb6bde03dd
commit 4335114fca
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/skins/SkinMinerva.php
View File

@ -214,8 +214,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
}
if ( $action === 'edit' ) {
return $this->isCurrentPageContentModelEditable() &&
!$this->getUser()->isBlockedFrom( $title, true );
return $this->isCurrentPageContentModelEditable();
}
if ( $action === 'switch-language' ) {
@ -1239,8 +1238,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
$title = $this->getTitle();
$user = $this->getUser();
return $title->quickUserCan( 'edit', $user )
&& ( $title->exists() || $title->quickUserCan( 'create', $user ) )
&& !$user->isBlockedFrom( $title, true );
&& ( $title->exists() || $title->quickUserCan( 'create', $user ) );
}
/**