diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 03:06:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 03:06:41 +0200 |
| commit | 31b221ae913c49fa2e2a776bd9fd54659728fcd0 (patch) | |
| tree | 01cf1ee53c1203df718f1ef4916dec670d32a3ff /phpBB/includes/session.php | |
| parent | dea1d660fb63b07451f1a43310de359251462644 (diff) | |
| parent | c79df9700df8fb238ae386e890dd97316bb97fc6 (diff) | |
| download | forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.gz forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.bz2 forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.tar.xz forums-31b221ae913c49fa2e2a776bd9fd54659728fcd0.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9712] Future dates can be formatted as 'less than one minute ago'
[ticket/9659] Signature options in set_user_options
[ticket/9703] Correct database leak where deleting user did not rm some PM data
[ticket/9697] Backlink broken when the select parent forum does not exist.
[ticket/9695] Correct the improper display of user input in mcp_ban.php
[ticket/9628] _add_module 'after'-parameter does not work correctly.
[ticket/9578] ACP Posting tab is missing "Post settings" module.
Diffstat (limited to 'phpBB/includes/session.php')
| -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 ec7d1e149b..d6f5bde997 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))); } |