wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 06:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix User::isAllowedAny() calls"

Browse source
This commit is contained in:
jenkins-bot 2016-08-22 23:48:25 +00:00 committed by Gerrit Code Review
parent 5da98b67bf 972d9b7c0f
commit fa68be8148
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Views/AbuseFilterViewDiff.php
View file

@ -100,7 +100,7 @@ class AbuseFilterViewDiff extends AbuseFilterView {
$this->mFilter = $this->mParams[1];
if ( AbuseFilter::filterHidden( $this->mFilter )
&& !$this->getUser()->isAllowedAny( array( 'abusefilter-modify', 'abusefilter-view-private' ) )
&& !$this->getUser()->isAllowedAny( 'abusefilter-modify', 'abusefilter-view-private' )
) {
$this->getOutput()->addWikiMsg( 'abusefilter-history-error-hidden' );
return false;

4
Views/AbuseFilterViewHistory.php
View file

@ -18,7 +18,7 @@ class AbuseFilterViewHistory extends AbuseFilterView {
# Check perms. abusefilter-modify is a superset of abusefilter-view-private
if ( $filter && AbuseFilter::filterHidden( $filter )
&& !$this->getUser()->isAllowedAny( array( 'abusefilter-modify', 'abusefilter-view-private' ) )
&& !$this->getUser()->isAllowedAny( 'abusefilter-modify', 'abusefilter-view-private' )
) {
$out->addWikiMsg( 'abusefilter-history-error-hidden' );
return;
@ -235,7 +235,7 @@ class AbuseFilterHistoryPager extends TablePager {
}
if ( !$this->getUser()->isAllowedAny(
array( 'abusefilter-modify', 'abusefilter-view-private' ) )
'abusefilter-modify', 'abusefilter-view-private' )
) {
// Hide data the user can't see.
$info['conds']['af_hidden'] = 0;