Alrighty, now we properly remove old blocks before inserting the new one. (Bug 10080...

[lhc/web/wiklou.git] / includes / Block.php

diff --git a/includes/Block.php b/includes/Block.php
index 3e91cf5..2a1ad69 100644 (file)
--- 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) );
                }