Fix a regression from 1.17: Show date/times in user preference timezone.

Ping r84258.

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 1b7d92c..2a917c3 100644 (file)
--- 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 6327cae..116f192 100644 (file)
--- 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 );
                }
        }