diff options
| author | Anatol Belski <ab@php.net> | 2014-12-06 12:31:55 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-06 12:31:55 +0100 |
| commit | 0854fd8b8114faa5bc4fa1736292525a5ecdea8b (patch) | |
| tree | 6b0c74078098dc64da0326c2013200d53670446d | |
| parent | 08241ee3f3624d9fa9be21739a5e5cde28c24d0a (diff) | |
| parent | 5d126245a3bb71b167a3b02a9d874c9247b556ff (diff) | |
| download | php-git-0854fd8b8114faa5bc4fa1736292525a5ecdea8b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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"); } |