diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 12:32:16 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 12:32:16 +0100 |
| commit | 51bae8805d267e45bb29b126b9f4c450d79de1b5 (patch) | |
| tree | ee37ec00e3b80ebaaa200f534efd2b039d82fa96 | |
| parent | 42d7cb4c2c7832591814f88628186ac156a631eb (diff) | |
| parent | 0854fd8b8114faa5bc4fa1736292525a5ecdea8b (diff) | |
| download | php-git-51bae8805d267e45bb29b126b9f4c450d79de1b5.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed test
| -rw-r--r-- | ext/standard/tests/strings/bug65230.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index ca2c3ca922..c707dd3691 100644 --- a/ext/standard/tests/strings/bug65230.phpt +++ b/ext/standard/tests/strings/bug65230.phpt @@ -21,7 +21,7 @@ function test($locale, $value) printf(" sep: %s\n", $sep); printf(" %%f: %f\n", $value); printf(" %%F: %F\n", $value); - printf("date: %s\n", strftime('%x')); + printf("date: %s\n", strftime('%x', mktime(0, 0, 0, 12, 5, 2014))); printf("\n"); } |