Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Ping r84258.
This commit is contained in:
Raimond Spekking 2011-10-06 09:52:34 +00:00
parent 1520976aa4
commit ed09139f27
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/specials/SpecialBlockList.php
View file

@ -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(

2
languages/Language.php
View file

@ -3541,7 +3541,7 @@ class Language {
: $infinity;
} else {
return $format === true
? $this->timeanddate( $expiry )
? $this->timeanddate( $expiry, /* User preference timezome */ true )
: wfTimestamp( $format, $expiry );
}
}