wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-23 10:18:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make global AbuseFilters searchable on Special:AbuseLog"

Browse source
This commit is contained in:
jenkins-bot 2013-07-10 17:17:13 +00:00 committed by Gerrit Code Review
parent 4532d1454f d2a342788f
commit 666db2e7ef
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/ApiQueryAbuseLog.php
View file

@ -159,8 +159,11 @@ class ApiQueryAbuseLog extends ApiQueryBase {
if ( $fld_ids ) {
$entry['id'] = intval( $row->afl_id );
$entry['filter_id'] = '';
if ( !AbuseFilter::filterHidden( $row->afl_filter ) || SpecialAbuseLog::canSeeHidden() ) {
$entry['filter_id'] = intval( $row->afl_filter );
if ( !AbuseFilter::filterHidden( $row->afl_filter )
|| AbuseFilterView::canViewPrivate()
|| $this->getUser()->isAllowed( 'abusefilter-log-private' )
) {
$entry['filter_id'] = $row->afl_filter;
}
}
if ( $fld_filter ) {

6
special/SpecialAbuseLog.php
View file

@ -88,7 +88,7 @@ class SpecialAbuseLog extends SpecialPage {
$this->mSearchTitle = $request->getText( 'wpSearchTitle' );
$this->mSearchFilter = null;
if ( self::canSeeDetails() ) {
$this->mSearchFilter = $request->getIntOrNull( 'wpSearchFilter' );
$this->mSearchFilter = $request->getText( 'wpSearchFilter' );
}
}
@ -288,9 +288,7 @@ class SpecialAbuseLog extends SpecialPage {
return;
}
$output = '';
$output .= Xml::element(
$output = Xml::element(
'legend',
null,
$this->msg( 'abusefilter-log-details-legend', $id )->text()