jenkins-bot has submitted this change and it was merged.
Change subject: API: Fix abuse log detail visibility for private filters
......................................................................
API: Fix abuse log detail visibility for private filters
This seems like it never really worked, changed the API
module to match the special page now.
Change-Id: I8dc6d5f5adfb7835ed8a5084b3407505aca2a6d5
---
M api/ApiQueryAbuseLog.php
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Anomie: Looks good to me, but someone else must approve
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiQueryAbuseLog.php b/api/ApiQueryAbuseLog.php
index d0d43f9..fbbf2fa 100644
--- a/api/ApiQueryAbuseLog.php
+++ b/api/ApiQueryAbuseLog.php
@@ -103,7 +103,7 @@
$this->addWhereRange( 'afl_timestamp', $params['dir'],
$params['start'], $params['end'] );
$db = $this->getDB();
- $notDeletedCond = SpecialAbuseLog::getNotDeletedCond($db);
+ $notDeletedCond = SpecialAbuseLog::getNotDeletedCond( $db );
if ( isset( $params['user'] ) ) {
$u = User::newFromName( $params['user'] );
@@ -155,14 +155,13 @@
) {
continue;
}
+ $canSeeDetails = SpecialAbuseLog::canSeeDetails(
$row->afl_filter );
+
$entry = array();
if ( $fld_ids ) {
$entry['id'] = intval( $row->afl_id );
$entry['filter_id'] = '';
- if ( !AbuseFilter::filterHidden(
$row->afl_filter )
- || AbuseFilterView::canViewPrivate()
- || $this->getUser()->isAllowed(
'abusefilter-log-private' )
- ) {
+ if ( $canSeeDetails ) {
$entry['filter_id'] = $row->afl_filter;
}
}
@@ -187,7 +186,7 @@
}
if ( $fld_revid && !is_null( $row->afl_rev_id ) ) {
$entry['revid'] = '';
- if ( !AbuseFilter::filterHidden(
$row->afl_filter ) || SpecialAbuseLog::canSeePrivate() ) {
+ if ( $canSeeDetails ) {
$entry['revid'] = $row->afl_rev_id;
}
}
@@ -197,7 +196,7 @@
}
if ( $fld_details ) {
$entry['details'] = array();
- if ( !AbuseFilter::filterHidden(
$row->afl_filter ) || SpecialAbuseLog::canSeePrivate() ) {
+ if ( $canSeeDetails ) {
$vars = AbuseFilter::loadVarDump(
$row->afl_var_dump );
if ( $vars instanceof
AbuseFilterVariableHolder ) {
$entry['details'] =
$vars->exportAllVars();
--
To view, visit https://gerrit.wikimedia.org/r/74164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8dc6d5f5adfb7835ed8a5084b3407505aca2a6d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
