diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:15:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:15:27 +0200 |
| commit | ec89d116096f96368dd969404fee4a9612940d62 (patch) | |
| tree | 98e1eaf3e0bcfaa7ea22d82256455902412361ac | |
| parent | 7694623cd2ea0d53aadbd87cd4c7bfa37369c7ff (diff) | |
| parent | cb8b245639ecbdd749c7cebd7db28a79942731d4 (diff) | |
| download | forums-ec89d116096f96368dd969404fee4a9612940d62.tar forums-ec89d116096f96368dd969404fee4a9612940d62.tar.gz forums-ec89d116096f96368dd969404fee4a9612940d62.tar.bz2 forums-ec89d116096f96368dd969404fee4a9612940d62.tar.xz forums-ec89d116096f96368dd969404fee4a9612940d62.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13105] Fix the code logic as described in the comment
| -rw-r--r-- | tests/datetime/from_format_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 0f87abc180..f10402e8cb 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -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( |