diff options
| author | Anatol Belski <ab@php.net> | 2014-04-25 17:40:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-25 17:40:19 +0200 |
| commit | 1c7f4d2b4bd797d2ce8d38fa0023d07484ea6c70 (patch) | |
| tree | d735cc4f4c6942d481f85f2339550d91a7a5e015 | |
| parent | 46344b11b44c11a7198e03c837f9e9f4ca2b572a (diff) | |
| parent | d3dcd616231e6eda97a7b474bbd585a7f61f0b71 (diff) | |
| download | php-git-1c7f4d2b4bd797d2ce8d38fa0023d07484ea6c70.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed test
| -rw-r--r-- | ext/date/tests/bug67118.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt index b10e9eaea3..6371757647 100644 --- a/ext/date/tests/bug67118.phpt +++ b/ext/date/tests/bug67118.phpt @@ -6,7 +6,7 @@ date.timezone=Europe/Berlin <?php class mydt extends datetime { - publi function __construct($tits\bug67118.phpte = 'now', $tz = NULL, $format = NULL) + public function __construct($time = 'now', $tz = NULL, $format = NULL) { if (!empty($tz) && !is_object($tz)) { $tz = new DateTimeZone($tz); |