Merge "Use the user from the context to format the date in Block::getPermissionsError()"

diff --git a/includes/Block.php b/includes/Block.php
index 3896369..c393a79 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1368,7 +1368,7 @@ class Block {
                        $this->getId(),
                        $lang->formatExpiry( $this->mExpiry ),
                        (string)$intended,
-                       $lang->timeanddate( wfTimestamp( TS_MW, $this->mTimestamp ), true ),
+                       $lang->userTimeAndDate( $this->mTimestamp, $context->getUser() ),
                );
        }
 }