From: Erik Moeller <erik@users.mediawiki.org>
Date: Wed, 7 Apr 2004 01:56:35 +0000 (+0000)
Subject: choose the min between the two block times when autoblocking a user with
X-Git-Tag: 1.3.0beta1~584
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=2f39ab8388d1094219c94ce23f2f976a8042989b;p=lhc%2Fweb%2Fwiklou.git

choose the min between the two block times when autoblocking a user with
a set expiry time
---

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 );
 		}