stklcode/statify-blacklist
1
0
Fork 0
Code Issues Actions Releases 21 Activity

Fix #12: do not skip filter chain on non-matching regex filter

Browse Source 
Corrected the regular expression methods and unit-tested combined filters.
This commit is contained in:
Stefan Kalscheuer
2018-05-19 14:22:15 +02:00
parent 66ddada63e
commit 92f8496926
3 changed files with 91 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inc/class-statifyblacklist.php
View File

@ -187,8 +187,10 @@ class StatifyBlacklist {
$regexp .= 'i';
}
// Check blacklist (return NULL to continue filtering).
return ( 1 === preg_match( $regexp, $referer ) ) ? true : null;
// Check blacklist (no return to continue filtering #12).
if ( 1 === preg_match( $regexp, $referer ) ) {
return true;
}
} else {
// Extract relevant domain parts.
$referer = wp_parse_url( wp_get_raw_referer() );
@ -218,8 +220,10 @@ class StatifyBlacklist {
$regexp .= 'i';
}
// Check blacklist (return NULL to continue filtering).
return ( 1 === preg_match( $regexp, $target ) ) ? true : null;
// Check blacklist (no return to continue filtering #12).
if ( 1 === preg_match( $regexp, $target ) ) {
return true;
}
} else {
// Extract target page.
// @codingStandardsIgnoreStart The globals are checked.