diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-10-01 17:18:37 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-10-01 17:18:37 +0000 |
| commit | 17989aba24faf1b63c7f5b9c35836fa6a2cc8afa (patch) | |
| tree | f50dbf285366ca2e36056e119d6b86c95f6f0bc7 /phpBB/includes/session.php | |
| parent | aa71cfaa8b2d938ef971328f0de1a2c5a1979ed8 (diff) | |
| download | forums-17989aba24faf1b63c7f5b9c35836fa6a2cc8afa.tar forums-17989aba24faf1b63c7f5b9c35836fa6a2cc8afa.tar.gz forums-17989aba24faf1b63c7f5b9c35836fa6a2cc8afa.tar.bz2 forums-17989aba24faf1b63c7f5b9c35836fa6a2cc8afa.tar.xz forums-17989aba24faf1b63c7f5b9c35836fa6a2cc8afa.zip | |
Allow for tomorrow in relative dates
git-svn-id: file:///svn/phpbb/trunk@6426 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 9c720bbb52..b0237c2f3f 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1323,12 +1323,17 @@ class user extends session $midnight = gmmktime(0, 0, 0, $m, $d, $y) - $this->timezone - $this->dst; } - if (strpos($format, '|') === false || (!($gmepoch > $midnight && !$forcedate) && !($gmepoch > $midnight - 86400 && !$forcedate))) + if (strpos($format, '|') === false || ($gmepoch < $midnight - 86400 && !$forcedate) || ($gmepoch > $midnight + 172800 && !$forcedate)) { return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates); } - if ($gmepoch > $midnight && !$forcedate) + if ($gmepoch > $midnight + 86400 && !$forcedate) + { + $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); + return str_replace('||', $this->lang['datetime']['TOMORROW'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); + } + else if ($gmepoch > $midnight && !$forcedate) { $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); return str_replace('||', $this->lang['datetime']['TODAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); |