makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Máté Bartus 2021-07-31 12:06:48 +02:00
commit f836605ab8
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/phpbb/datetime.php
View file

@ -97,19 +97,19 @@ class datetime extends \DateTime
$midnight = $midnight->getTimestamp();
if ($timestamp <= $midnight + 2 * 86400)
if ($timestamp < $midnight + 2 * 86400)
{
$day = false;
if ($timestamp > $midnight + 86400)
if ($timestamp >= $midnight + 86400)
{
$day = 'TOMORROW';
}
else if ($timestamp > $midnight)
else if ($timestamp >= $midnight)
{
$day = 'TODAY';
}
else if ($timestamp > $midnight - 86400)
else if ($timestamp >= $midnight - 86400)
{
$day = 'YESTERDAY';
}

15
tests/datetime/from_format_test.php
View file

@ -58,7 +58,6 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
$this->assertEquals($expected, $user->format_date($timestamp, $format, true));
}
public function relative_format_date_data()
{
// If the current time is too close to the testing time,
@ -103,6 +102,20 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false,
gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time,
),
// Test edge cases: Yesterday 00:00, Today 00:00, Tomorrow 00:00
array(
gmdate('Y-m-d', strtotime('yesterday')) . ' 00:00', false,
'Yesterday 00:00',
),
array(
gmdate('Y-m-d', strtotime('today')) . ' 00:00', false,
'Today 00:00',
),
array(
gmdate('Y-m-d', strtotime('tomorrow')) . ' 00:00', false,
'Tomorrow 00:00',
),
);
}