iliaa Mon Dec 11 21:04:40 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/date/tests bug39782.phpt
Modified files:
/php-src NEWS
/php-src/ext/date php_date.c
Log:
Fixed bug #39782 (setTime() on a DateTime constructed with a Weekday
yields incorrect results).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.424&r2=1.2027.2.547.2.425&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.424 php-src/NEWS:1.2027.2.547.2.425
--- php-src/NEWS:1.2027.2.547.2.424 Mon Dec 11 14:54:14 2006
+++ php-src/NEWS Mon Dec 11 21:04:40 2006
@@ -54,6 +54,8 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.34&r2=1.43.2.45.2.35&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.34
php-src/ext/date/php_date.c:1.43.2.45.2.35
--- php-src/ext/date/php_date.c:1.43.2.45.2.34 Mon Nov 6 16:11:26 2006
+++ php-src/ext/date/php_date.c Mon Dec 11 21:04:40 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.34 2006/11/06 16:11:26 bjori Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.35 2006/12/11 21:04:40 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1643,6 +1643,8 @@
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);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug39782.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/bug39782.phpt
+++ php-src/ext/date/tests/bug39782.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
