diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 01:21:55 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 01:21:55 +0200 |
| commit | ef753d046db24550a875e1f54bdd0a2d3a4fb07a (patch) | |
| tree | 27e647010c2370d6523d53e21089dbddcc79e50c | |
| parent | 4ac5d5e3527da561c37e24e778bd6dad23e1bf83 (diff) | |
| parent | 9764a3213842cefea3641b2f29b58f345b578d69 (diff) | |
| download | forums-ef753d046db24550a875e1f54bdd0a2d3a4fb07a.tar forums-ef753d046db24550a875e1f54bdd0a2d3a4fb07a.tar.gz forums-ef753d046db24550a875e1f54bdd0a2d3a4fb07a.tar.bz2 forums-ef753d046db24550a875e1f54bdd0a2d3a4fb07a.tar.xz forums-ef753d046db24550a875e1f54bdd0a2d3a4fb07a.zip | |
Merge branch 'ticket/cs278/9712' into develop-olympus
* ticket/cs278/9712:
[ticket/9712] Future dates can be formatted as 'less than one minute ago'
| -rw-r--r-- | phpBB/includes/session.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 0a01b4e73b..e157053e61 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -2134,9 +2134,9 @@ class user extends session // Zone offset $zone_offset = $this->timezone + $this->dst; - // Show date <= 1 hour ago as 'xx min ago' + // Show date <= 1 hour ago as 'xx min ago' but not greater than 60 seconds in the future // A small tolerence is given for times in the future but in the same minute are displayed as '< than a minute ago' - if ($delta <= 3600 && ($delta >= -5 || (($now / 60) % 60) == (($gmepoch / 60) % 60)) && $date_cache[$format]['is_short'] !== false && !$forcedate && isset($this->lang['datetime']['AGO'])) + if ($delta <= 3600 && $delta > -60 && ($delta >= -5 || (($now / 60) % 60) == (($gmepoch / 60) % 60)) && $date_cache[$format]['is_short'] !== false && !$forcedate && isset($this->lang['datetime']['AGO'])) { return $this->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60))); } |