makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/new-tz-handling] Fix bug from 3.0 formatting future dates.

Browse source 
Future dates can get formatted as 'less than a minute ago' if they
occur in the future on the same minute as the current minute.

PHPBB3-9558 PHPBB3-9712
This commit is contained in:
Chris Smith 2010-07-07 22:52:04 +01:00 • committed by Oleg Pudeyev
parent 5dd7916c49
commit e9fe9ea518
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/datetime.php
View file

@ -85,9 +85,10 @@ class phpbb_datetime extends DateTime
if ($relative) if ($relative)
{ {
// Check the delta is less than or equal to 1 hour // Check the delta is less than or equal to 1 hour
// and the delta not more than a minute in the past
// and the delta is either greater than -5 seconds or timestamp and current time are of the same minute (they must be in the same hour already) // and the delta is either greater than -5 seconds or timestamp and current time are of the same minute (they must be in the same hour already)
// finally check that relative dates are supported by the language pack // finally check that relative dates are supported by the language pack
if ($delta <= 3600 && ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) && isset($this->_user->lang['datetime']['AGO'])) if ($delta <= 3600 && $delta > -60 && ($delta >= -5 || (($now_ts / 60) % 60) == (($timestamp / 60) % 60)) && isset($this->_user->lang['datetime']['AGO']))
{ {
return $this->_user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60))); return $this->_user->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60)));
} }