From 3a97d9ffa9d7f9074cc0c6baea6167233ea27bbb Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 16 Feb 2004 00:05:25 +0000
Subject: [PATCH] proper handling of infinite expiry

---
 includes/Block.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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() 
-- 
2.20.1