From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 23 May 2008 20:31:41 +0000 (+0000)
Subject: drop redundant wfTimestamp() call... we already got it formatted in TS_MW from decode... 
X-Git-Tag: 1.31.0-rc.0~47429
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=7b0abe4335f9de8d9c0ad686dbb06ebf8885d524;p=lhc%2Fweb%2Fwiklou.git

drop redundant wfTimestamp() call... we already got it formatted in TS_MW from decodeExpiry()
---

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) );
 		}