diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:15:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:15:26 +0200 |
| commit | cb8b245639ecbdd749c7cebd7db28a79942731d4 (patch) | |
| tree | c40b5f9e2df78fabb1bcf1c260ef2a57a740df47 | |
| parent | 8fb9f19aaef087040ffa779add028bacb497c0d1 (diff) | |
| parent | 89fdd1baf2034d2cc52e7f8c3aff3d097ad9c470 (diff) | |
| download | forums-cb8b245639ecbdd749c7cebd7db28a79942731d4.tar forums-cb8b245639ecbdd749c7cebd7db28a79942731d4.tar.gz forums-cb8b245639ecbdd749c7cebd7db28a79942731d4.tar.bz2 forums-cb8b245639ecbdd749c7cebd7db28a79942731d4.tar.xz forums-cb8b245639ecbdd749c7cebd7db28a79942731d4.zip | |
Merge pull request #3005 from nickvergessen/ticket/13105
[ticket/13105] Fix the code logic as described in the comment
* nickvergessen/ticket/13105:
[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( |