From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Thu, 7 Jun 2012 20:45:02 +0000 (+0200)
Subject: Changed two remaining calls to Language::timeanddate() to Language::userTimeAndDate... 
X-Git-Tag: 1.31.0-rc.0~23355^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=9358a8f489265e998453bd249d148d10dfd9b53a;p=lhc%2Fweb%2Fwiklou.git

Changed two remaining calls to Language::timeanddate() to Language::userTimeAndDate() in includes/specials.

Change-Id: I2825aa96b562b716bf41da3dde3db436c5d40990
---

diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php
index 284b85a5f2..ddab164b70 100644
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -197,7 +197,7 @@ class ImageListPager extends TablePager {
 				$thumb = $file->transform( array( 'width' => 180, 'height' => 360 ) );
 				return $thumb->toHtml( array( 'desc-link' => true ) );
 			case 'img_timestamp':
-				return htmlspecialchars( $this->getLanguage()->timeanddate( $value, true ) );
+				return htmlspecialchars( $this->getLanguage()->userTimeAndDate( $value, $this->getUser() ) );
 			case 'img_name':
 				static $imgfile = null;
 				if ( $imgfile === null ) $imgfile = $this->msg( 'imgfile' )->text();
diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 59b4300a10..b5fb0dddf6 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -252,9 +252,11 @@ class SpecialMergeHistory extends SpecialPage {
 		$ts = wfTimestamp( TS_MW, $row->rev_timestamp );
 		$checkBox = Xml::radio( 'mergepoint', $ts, false );
 
+		$user = $this->getUser();
+
 		$pageLink = Linker::linkKnown(
 			$rev->getTitle(),
-			htmlspecialchars( $this->getLanguage()->timeanddate( $ts ) ),
+			htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) ),
 			array(),
 			array( 'oldid' => $rev->getId() )
 		);
@@ -263,7 +265,7 @@ class SpecialMergeHistory extends SpecialPage {
 		}
 
 		# Last link
-		if( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+		if( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
 			$last = $this->message['last'];
 		} elseif( isset( $this->prevId[$row->rev_id] ) ) {
 			$last = Linker::linkKnown(