From ed09139f275a201afedb05d0f35682b07e9ba940 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Thu, 6 Oct 2011 09:52:34 +0000
Subject: [PATCH] Fix a regression from 1.17: Show date/times in user
 preference timezone. Ping r84258.

---
 includes/specials/SpecialBlockList.php | 4 ++--
 languages/Language.php                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 1b7d92c5f4..2a917c35d9 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -246,7 +246,7 @@ class BlockListPager extends TablePager {
 
 		switch( $name ) {
 			case 'ipb_timestamp':
-				$formatted = $this->getLang()->timeanddate( $value );
+				$formatted = $this->getLang()->timeanddate( $value, /* User preference timezome */ true );
 				break;
 
 			case 'ipb_target':
@@ -272,7 +272,7 @@ class BlockListPager extends TablePager {
 				break;
 
 			case 'ipb_expiry':
-				$formatted = $this->getLang()->formatExpiry( $value );
+				$formatted = $this->getLang()->formatExpiry( $value, /* User preference timezome */ true );
 				if( $this->getUser()->isAllowed( 'block' ) ){
 					if( $row->ipb_auto ){
 						$links[] = Linker::linkKnown(
diff --git a/languages/Language.php b/languages/Language.php
index 6327caec37..116f192d7a 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3541,7 +3541,7 @@ class Language {
 				: $infinity;
 		} else {
 			return $format === true
-				? $this->timeanddate( $expiry )
+				? $this->timeanddate( $expiry, /* User preference timezome */ true )
 				: wfTimestamp( $format, $expiry );
 		}
 	}
-- 
2.20.1