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 #41599 (setTime() fails after modify() is used).

Browse Source
This commit is contained in:
Derick Rethans 2008-01-17 20:59:10 +00:00
parent 3d0797da2b
commit 2d2552956c
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -106,6 +106,7 @@ PHP NEWS
DateTimeZone). (Derick)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
characters). (Jani)
- Fixed bug #41599 (setTime() fails after modify() is used). (Derick)
- Fixed bug #41522 (PDO firebird driver returns null if it fails to connect).
(Lars W)
- Fixed bug #39822 (new PDO() doesn't work with firebird). (Lars W)

2
ext/date/lib/tm2unixtime.c
View File

@ -98,6 +98,7 @@ static void do_adjust_for_weekday(timelib_time* time)
} else {
time->d -= (7 - (abs(time->relative.weekday) - current_dow));
}
time->have_weekday_relative = 0;
}
static void do_normalize(timelib_time* time)
@ -130,6 +131,7 @@ static void do_adjust_relative(timelib_time* time)
do_normalize(time);
memset(&(time->relative), 0, sizeof(time->relative));
time->have_relative = 0;
}
static void do_adjust_special_weekday(timelib_time* time)

27
ext/date/tests/bug41599.phpt Normal file
View File

@ -0,0 +1,27 @@
--TEST--
Bug #41599 (setTime() fails after modify() is used)
--FILE--
<?php
date_default_timezone_set('Europe/London');
$start = new DateTime('2008-01-17 last Monday');
echo $start->format('Y-m-d H:i:s'),PHP_EOL;
//good
$start->modify('Tuesday');
echo $start->format('Y-m-d H:i:s'),PHP_EOL;
//good
$start->setTime(4, 0, 0);
echo $start->format('Y-m-d H:i:s'),PHP_EOL;
//jumped to next Sunday
$start->setTime(8, 0, 0);
echo $start->format('Y-m-d H:i:s'),PHP_EOL;
//jumped to next Sunday again
?>
--EXPECT--
2008-01-14 00:00:00
2008-01-15 00:00:00
2008-01-15 04:00:00
2008-01-15 08:00:00