aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-01-23 12:13:02 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-01-23 12:13:02 +0000
commitd3fa81c26112f65bac716a15d8d6baafff7dd707 (patch)
tree5b28546c2307b5263074ca5a8b7fdd3d89e58731 /phpBB/includes
parent950842de5c30908b8cab3227774d6414cb37a333 (diff)
downloadforums-d3fa81c26112f65bac716a15d8d6baafff7dd707.tar
forums-d3fa81c26112f65bac716a15d8d6baafff7dd707.tar.gz
forums-d3fa81c26112f65bac716a15d8d6baafff7dd707.tar.bz2
forums-d3fa81c26112f65bac716a15d8d6baafff7dd707.tar.xz
forums-d3fa81c26112f65bac716a15d8d6baafff7dd707.zip
Correctly display future dates (Bug #38755)
git-svn-id: file:///svn/phpbb/trunk@9299 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/classes/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/classes/user.php b/phpBB/includes/classes/user.php
index f24f1f1a59..739c338377 100644
--- a/phpBB/includes/classes/user.php
+++ b/phpBB/includes/classes/user.php
@@ -818,7 +818,7 @@ class phpbb_user extends phpbb_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;