From 7b0abe4335f9de8d9c0ad686dbb06ebf8885d524 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 23 May 2008 20:31:41 +0000
Subject: [PATCH] drop redundant wfTimestamp() call... we already got it
 formatted in TS_MW from decodeExpiry()

---
 includes/Block.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Block.php b/includes/Block.php
index 3e91cf5720..2a1ad69a2f 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -731,7 +731,7 @@ class Block
 			$expirystr = $msg['infiniteblock'];
 		} else {
 			global $wgLang;
-			$expiretimestr = $wgLang->timeanddate( wfTimestamp( TS_MW, $expiry ), true );
+			$expiretimestr = $wgLang->timeanddate( $expiry, true );
 			$expirystr = wfMsgReplaceArgs( $msg['expiringblock'], array($expiretimestr) );
 		}
 
-- 
2.20.1