From: Derick Rethans <derick@php.net>
Date: Thu, 18 Dec 2008 20:32:23 +0000 (+0000)
Subject: - MFH: Fixed bug #46268 (DateTime::modify() does not reset relative time
X-Git-Tag: php-5.3.0beta1~403
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5491af3c5fe51812f9f7e302423ba443f0286d8;p=php

- MFH: Fixed bug #46268 (DateTime::modify() does not reset relative time
  values).
---

diff --git a/NEWS b/NEWS
index b8a98e815d..2d23214296 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ PHP                                                                        NEWS
   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)
 
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 1ddc6a57e0..5f354acc0a 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2705,6 +2705,7 @@ PHP_FUNCTION(date_modify)
 
 	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 @@ PHP_FUNCTION(date_add)
 
 	timelib_update_ts(dateobj->time, NULL);
 	timelib_update_from_sse(dateobj->time);
+	dateobj->time->have_relative = 0;
 
 	RETURN_ZVAL(object, 1, 0);
 }
diff --git a/ext/date/tests/bug46268.phpt b/ext/date/tests/bug46268.phpt
new file mode 100644
index 0000000000..dd2d4a3ca5
--- /dev/null
+++ b/ext/date/tests/bug46268.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #46268 (When call DateTime#setTime, it seems to be called the last modify method too)
+--FILE--
+<?php
+date_default_timezone_set('Asia/Tokyo');
+
+$now = new DateTime('2008-10-10 01:02:03');
+echo $now->format("Y-m-d H:i:s") . PHP_EOL;
+
+$now->modify("1 day after");
+echo $now->format("Y-m-d H:i:s") . PHP_EOL;
+
+$now->modify("1 hour after");
+echo $now->format("Y-m-d H:i:s") . PHP_EOL;
+
+$now->setTime(0, 0, 0);
+//date_time_set($now, 0, 0, 0);
+echo $now->format("Y-m-d H:i:s") . PHP_EOL;
+--EXPECT--
+2008-10-10 01:02:03
+2008-10-11 01:02:03
+2008-10-11 02:02:03
+2008-10-11 00:00:00