From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 16 Feb 2004 00:05:25 +0000 (+0000)
Subject: proper handling of infinite expiry
X-Git-Tag: 1.3.0beta1~982
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=3a97d9ffa9d7f9074cc0c6baea6167233ea27bbb;p=lhc%2Fweb%2Fwiklou.git

proper handling of infinite expiry
---

diff --git a/includes/Block.php b/includes/Block.php
index 13cb657aa7..891598d2e1 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -179,7 +179,11 @@ class Block
 
 	function isExpired() 
 	{	
-		return wfTimestampNow() > $this->mExpiry;
+		if ( !$this->mExpiry ) {
+			return false;
+		} else {
+			return wfTimestampNow() > $this->mExpiry;
+		}
 	}
 
 	function isValid()