From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 22 Feb 2004 02:58:34 +0000 (+0000)
Subject: bug fix
X-Git-Tag: 1.3.0beta1~966
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=217fe2a19feafbcdbd4fe2963d4378d23b4973e1;p=lhc%2Fweb%2Fwiklou.git

bug fix
---

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index a0aed6b239..a82a2fb628 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -112,18 +112,21 @@ class IPBlockForm {
 		}
 
 		if ( $wpBlockExpiry == "infinite" || $wpBlockExpiry == "indefinite" ) {
-			$expiry = 0;
+			$expiry = '';
 		} else {
 			# Convert GNU-style date, returns -1 on error
 			$expiry = strtotime( $wpBlockExpiry );
-		}
 
-		if ( $expiry < 0 ) {
-			$this->showForm( wfMsg( "ipb_expiry_invalid" ) );
-			return;
+			if ( $expiry < 0 ) {
+				$this->showForm( wfMsg( "ipb_expiry_invalid" ) );
+				return;
+			}
+			
+			$expiry = wfUnix2Timestamp( $expiry );
+
 		}
-		$expiry = wfUnix2Timestamp( $expiry );
 
+		
 		if ( "" == $wpBlockReason ) {
 			$this->showForm( wfMsg( "noblockreason" ) );
 			return;