From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Tue, 8 Jul 2014 20:13:01 +0000 (+0200)
Subject: Use the user from the context to format the date in Block::getPermissionsError()
X-Git-Tag: 1.31.0-rc.0~15027^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=c915c406c153939f08060c7b56ab55e7b478fe4e;p=lhc%2Fweb%2Fwiklou.git

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

Language::timeanddate() uses $wgUser to get the time correction and the
format to use.

Change-Id: I7dee3ae523d99aec7b36a317612a61376cf26d21
---

diff --git a/includes/Block.php b/includes/Block.php
index 3896369ce4..c393a795d4 100644
--- 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() ),
 		);
 	}
 }