mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 05:20:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13105] Fix the code logic as described in the comment
This commit is contained in:
Andreas Fischer
2014-09-30 21:15:27 +02:00
parent 7694623cd2 cb8b245639
commit ec89d11609
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/datetime/from_format_test.php
View File

@@ -60,7 +60,7 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
// If the current time is too close to the testing time,
// the relative time will use "x minutes ago" instead of "today ..."
// So we use 18:01 in the morning and 06:01 in the afternoon.
$testing_time = date('H') <= 12 ? '06:01' : '18:01';
$testing_time = date('H') <= 12 ? '18:01' : '06:01';
return array(
array(