wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-27 23:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix Special:AbuseLog not to throw when global filters are not available anymore"

Browse source
This commit is contained in:
jenkins-bot 2020-12-08 12:56:37 +00:00 committed by Gerrit Code Review
parent c5d6373a7a 08db320afe
commit 9a77dd91ea
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/special/SpecialAbuseLog.php
View file

@ -1175,12 +1175,16 @@ class SpecialAbuseLog extends AbuseFilterSpecialPage {
// Pull global filter description
$lookup = AbuseFilterServices::getFilterLookup();
try {
$globalDesc = $lookup->getFilter( $filterID, true )->getName();
$filterObj = $lookup->getFilter( $filterID, true );
$globalDesc = $filterObj->getName();
$escaped_comments = Sanitizer::escapeHtmlAllowEntities( $globalDesc );
$filter_hidden = $filterObj->isHidden();
} catch ( CentralDBNotAvailableException $_ ) {
$escaped_comments = $this->msg( 'abusefilter-log-description-not-available' )->escaped();
// either hide all filters, including not hidden, or show all, including hidden
// we choose the former
$filter_hidden = true;
}
$filter_hidden = $lookup->getFilter( $filterID, $global )->isHidden();
} else {
$escaped_comments = Sanitizer::escapeHtmlAllowEntities(
$row->af_public_comments );