Merge "SECURITY: Unbreak blocks shorter than one hour"

This commit is contained in:
jenkins-bot 2019-12-04 18:17:58 +00:00 committed by Gerrit Code Review
commit 357dcdce5c

View file

@ -728,7 +728,7 @@ class AbuseFilterRunner {
}
$currentExpiry = SpecialBlock::parseExpiryInput( $expiry );
if ( $currentExpiry > SpecialBlock::parseExpiryInput( $maxExpiry ) ) {
if ( $maxExpiry === -1 || $currentExpiry > SpecialBlock::parseExpiryInput( $maxExpiry ) ) {
// Save the parameters to issue the block with
$maxExpiry = $expiry;
$blockValues = [