wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 02:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add missing parameter and suppress warnings for regex errors"

Browse source
This commit is contained in:
jenkins-bot 2018-04-26 02:28:19 +00:00 committed by Gerrit Code Review
parent 04325d0f99 c2302385c1
commit 0b35bdcae9
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Views/AbuseFilterViewList.php
View file

@ -83,7 +83,7 @@ class AbuseFilterViewList extends AbuseFilterView {
);
$this->showList(
[ 'af_deleted' => 0 ],
compact( 'deleted', 'hidedisabled', 'querypattern', 'searchmode', 'scope' )
compact( 'deleted', 'hidedisabled', 'querypattern', 'searchmode', 'scope', 'searchEnabled' )
);
return;
}

4
includes/pagers/AbuseFilterPager.php
View file

@ -119,12 +119,14 @@ class AbuseFilterPager extends TablePager {
}
$length = mb_strlen( $this->mQuery[0], 'UTF8' );
} elseif ( $this->mQuery[1] === 'RLIKE' ) {
Wikimedia\suppressWarnings();
$check = preg_match(
'/' . $this->mQuery[0] . '/',
$row->af_pattern,
$matches,
PREG_OFFSET_CAPTURE
);
Wikimedia\restoreWarnings();
// This may happen in case of catastrophic backtracking
if ( $check === false ) {
return htmlspecialchars( mb_substr( $row->af_pattern, 0, 50, 'UTF8' ) );
@ -132,12 +134,14 @@ class AbuseFilterPager extends TablePager {
$length = mb_strlen( $matches[0][0], 'UTF8' );
$position = $matches[0][1];
} elseif ( $this->mQuery[1] === 'IRLIKE' ) {
Wikimedia\suppressWarnings();
$check = preg_match(
'/' . $this->mQuery[0] . '/i',
$row->af_pattern,
$matches,
PREG_OFFSET_CAPTURE
);
Wikimedia\restoreWarnings();
// This may happen in case of catastrophic backtracking
if ( $check === false ) {
return htmlspecialchars( mb_substr( $row->af_pattern, 0, 50, 'UTF8' ) );