clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday

Browse Source 
yields incorrect results).
This commit is contained in:
Ilia Alshanetsky 2006-12-11 21:04:40 +00:00
parent 5218d956f0
commit 2f291233e6
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -54,6 +54,8 @@ PHP NEWS
multipliers). (Ilia)
- Fixed bug #39787 (PHP doesn't work with Apache 2.3). (mv at binarysec dot
com).
- Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday
yields incorrect results). (Ilia)
- Fixed bug #39780 (PNG image with CRC/data error raises fatal error) (Pierre)
- Fixed bug #39775 ("Indirect modification ..." message is not shown). (Dmitry)
- Fixed bug #39763 (magic quotes are applied twice by ext/filter in

2
ext/date/php_date.c
View File

@ -1643,6 +1643,8 @@ static void date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int
timelib_fill_holes(dateobj->time, now, 0);
timelib_update_ts(dateobj->time, tzi);
dateobj->time->have_weekday_relative = dateobj->time->have_relative = 0;
if (now->tz_info != tzi) {
timelib_tzinfo_dtor(now->tz_info);
}

19
ext/date/tests/bug39782.phpt Normal file
View File

@ -0,0 +1,19 @@
--TEST--
Bug #39782 (setTime() on a DateTime constructed with a Weekday yields incorrect results)
--FILE--
<?php
date_default_timezone_set("GMT");
$dttTest = new DateTime('Dec 10 2006 Next Wednesday');
echo $dttTest->format('D M j Y - H:i:s') . "\n";
$dttTest->setTime(12, 0, 0);
echo $dttTest->format('D M j Y - H:i:s') . "\n";
$dttTest->setTime(12, 0, 0);
echo $dttTest->format('D M j Y - H:i:s') . "\n";
?>
--EXPECT--
Wed Dec 13 2006 - 00:00:00
Wed Dec 13 2006 - 12:00:00
Wed Dec 13 2006 - 12:00:00