proper handling of infinite expiry

diff --git a/includes/Block.php b/includes/Block.php
index 13cb657..891598d 100644 (file)
--- 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()