From 2f39ab8388d1094219c94ce23f2f976a8042989b Mon Sep 17 00:00:00 2001 From: Erik Moeller Date: Wed, 7 Apr 2004 01:56:35 +0000 Subject: [PATCH] choose the min between the two block times when autoblocking a user with a set expiry time --- includes/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/User.php b/includes/User.php index 35d5526899..287c49c9e9 100644 --- a/includes/User.php +++ b/includes/User.php @@ -625,7 +625,7 @@ class User { # If the user is already blocked with an expiry date, we don't # want to pile on top of that! if($userblock->mExpiry) { - $ipblock->mExpiry = $userblock->mExpiry; + $ipblock->mExpiry = min ( $userblock->mExpiry, Block::getAutoblockExpiry( $ipblock->mTimestamp )); } else { $ipblock->mExpiry = Block::getAutoblockExpiry( $ipblock->mTimestamp ); } -- 2.20.1