diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-23 12:11:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-23 12:11:45 +0000 |
| commit | f0092cd1f2ae97a655434cae6b8c69b202314720 (patch) | |
| tree | 8ef1a6b15fabbe6857daba5904516e337a9da41f /phpBB | |
| parent | 185102bc01c021a68f0951308435e8fd99fbdca2 (diff) | |
| download | forums-f0092cd1f2ae97a655434cae6b8c69b202314720.tar forums-f0092cd1f2ae97a655434cae6b8c69b202314720.tar.gz forums-f0092cd1f2ae97a655434cae6b8c69b202314720.tar.bz2 forums-f0092cd1f2ae97a655434cae6b8c69b202314720.tar.xz forums-f0092cd1f2ae97a655434cae6b8c69b202314720.zip | |
Correctly display future dates (Bug #38755)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9298 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 23bc728b7e..6fd2da068a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -90,6 +90,7 @@ <li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li> <li>[Fix] Posts incremented for multiple approval of the same topic (Bug #40495 - Patch by TerraFrost)</li> <li>[Fix] Missing read permission from calls to phpbb_chmod()</li> + <li>[Fix] Correctly display future dates (Bug #38755)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index c7d287181b..f1285c0203 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -2050,7 +2050,7 @@ class user extends session } // Show date <= 1 hour ago as 'xx min ago' - // A small tolerence is given for times in the future and times in the future but in the same minute are displayed as '< than a minute ago' + // 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'])) { return $this->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60))); @@ -2062,7 +2062,7 @@ class user extends session $midnight = gmmktime(0, 0, 0, $m, $d, $y) - $date_cache[$format]['zone_offset']; } - if ($date_cache[$format]['is_short'] !== false && !$forcedate) + if ($date_cache[$format]['is_short'] !== false && !$forcedate && !($gmepoch < $midnight - 86400 || $gmepoch > $midnight + 172800)) { $day = false; |