derick Thu Dec 18 20:32:24 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug46268.phpt
Modified files:
/php-src NEWS
/php-src/ext/date php_date.c
Log:
- MFH: Fixed bug #46268 (DateTime::modify() does not reset relative time
values).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.418&r2=1.2027.2.547.2.965.2.419&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.418
php-src/NEWS:1.2027.2.547.2.965.2.419
--- php-src/NEWS:1.2027.2.547.2.965.2.418 Thu Dec 18 14:30:13 2008
+++ php-src/NEWS Thu Dec 18 20:32:23 2008
@@ -14,6 +14,8 @@
given bad data). (Ilia)
- Fixed bug #46738 (Segfault when mb_detect_encoding() fails). (Scott)
- Fixed bug #46681 (mkdir() fails silently on PHP 5.3). (Hannes)
+- Fixed bug #46268 (DateTime::modify() does not reset relative time values).
+ (Derick)
- Fixed bug #45989 (json_decode() doesn't return NULL on certain
invalid strings). (magicaltux, Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.62&r2=1.43.2.45.2.51.2.63&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.51.2.62
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.63
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.62 Thu Dec 18 14:55:13 2008
+++ php-src/ext/date/php_date.c Thu Dec 18 20:32:23 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.62 2008/12/18 14:55:13 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.63 2008/12/18 20:32:23 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2705,6 +2705,7 @@
timelib_update_ts(dateobj->time, NULL);
timelib_update_from_sse(dateobj->time);
+ dateobj->time->have_relative = 0;
RETURN_ZVAL(object, 1, 0);
}
@@ -2749,6 +2750,7 @@
timelib_update_ts(dateobj->time, NULL);
timelib_update_from_sse(dateobj->time);
+ dateobj->time->have_relative = 0;
RETURN_ZVAL(object, 1, 0);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug46268.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/bug46268.phpt
+++ php-src/ext/date/tests/bug46268.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
