jenkins-bot has submitted this change and it was merged.
Change subject: Allow users with 'abusefilter-view-private' to view
history/diff of private filters
......................................................................
Allow users with 'abusefilter-view-private' to view history/diff of private
filters
These pages are read only pages so it's better to let users with
'abusefilter-view-private' to view history and diff of private filters
as 'abusefilter-modify' is a read+write right.
Bug: T126129
Change-Id: I9e15326c8d681000ab13ef8a50fa0eed4c24dbe6
---
M Views/AbuseFilterViewDiff.php
M Views/AbuseFilterViewHistory.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Views/AbuseFilterViewDiff.php b/Views/AbuseFilterViewDiff.php
index 328d5a0..1c9e61a 100644
--- a/Views/AbuseFilterViewDiff.php
+++ b/Views/AbuseFilterViewDiff.php
@@ -99,9 +99,9 @@
$newSpec = $this->mParams[4];
$this->mFilter = $this->mParams[1];
- if ( AbuseFilter::filterHidden( $this->mFilter ) &&
- !$this->getUser()->isAllowed(
'abusefilter-modify' ) &&
- !$this->getUser()->isAllowed(
'abusefilter-view-private' ) ) {
+ if ( AbuseFilter::filterHidden( $this->mFilter )
+ && !$this->getUser()->isAllowed(
'abusefilter-view-private' )
+ ) {
$this->getOutput()->addWikiMsg(
'abusefilter-history-error-hidden' );
return false;
}
diff --git a/Views/AbuseFilterViewHistory.php b/Views/AbuseFilterViewHistory.php
index bedbafc..82e18bf 100644
--- a/Views/AbuseFilterViewHistory.php
+++ b/Views/AbuseFilterViewHistory.php
@@ -17,9 +17,9 @@
}
# Check perms
- if ( $filter &&
- !$this->getUser()->isAllowed(
'abusefilter-modify' ) &&
- AbuseFilter::filterHidden( $filter ) ) {
+ if ( $filter && AbuseFilter::filterHidden( $filter )
+ && !$this->getUser()->isAllowed(
'abusefilter-view-private' )
+ ) {
$out->addWikiMsg( 'abusefilter-history-error-hidden' );
return;
}
@@ -234,7 +234,7 @@
$info['conds']['afh_filter'] = $this->mFilter;
}
- if ( !$this->getUser()->isAllowed( 'abusefilter-modify' ) ) {
+ if ( !$this->getUser()->isAllowed( 'abusefilter-view-private' )
) {
// Hide data the user can't see.
$info['conds']['af_hidden'] = 0;
}
--
To view, visit https://gerrit.wikimedia.org/r/285422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e15326c8d681000ab13ef8a50fa0eed4c24dbe6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <glaisher.w...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: MarcoAurelio <strig...@gmail.com>
Gerrit-Reviewer: Samtar <samtarli...@gmail.com>
Gerrit-Reviewer: Se4598 <se4...@gmx.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
