- Fixed bug #49059 (DateTime::diff() repeats previous sub() operation).

diff --git a/NEWS b/NEWS
index 8cdfc87e2a829481a2cc43b36e5592467ead6feb..cb4fe2054dd6b429211974e3b86eea6b4ed2d427 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,8 @@ PHP                                                                        NEWS
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
 - Fixed bug #49778 (DateInterval::format("%a") is always zero when an interval
   is created from an ISO string). (Derick)
+- Fixed bug #49059 (DateTime::diff() repeats previous sub() operation).
+  (yoarvi@gmail.com, Derick)
 
 
 ?? ??? 20??, PHP 5.3.2

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index afd09cd5d4611839ac29e24bc3fa2338c5768fed..0cc86feeb7d0bf27aa717964821d549683d820ba 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2880,6 +2880,8 @@ PHP_FUNCTION(date_sub)
        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/bug49059.phpt b/ext/date/tests/bug49059.phpt
new file mode 100644 (file)
index 0000000..48d2dac
--- /dev/null
+++ b/ext/date/tests/bug49059.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Bug #49059 (DateTime::diff() repeats previous sub() operation)
+--FILE--
+<?php
+date_default_timezone_set('Asia/Calcutta');
+
+$date1 = date_create("2009-03-27");
+$date2 = date_create("2009-03-01");
+print "\$date1 at init: " . $date1->format("Y-m-d") . "\n";
+print "\$date2 at init: " . $date2->format("Y-m-d") . "\n";
+$diff = $date1->diff($date2);
+print "\$date1 after first diff: " . $date1->format("Y-m-d") . "\n";
+print "\$diff->days after first diff: " . $diff->days . "\n";
+$date1 = $date1->sub(new DateInterval("P2D"));
+print "\$date1 after sub: " . $date1->format("Y-m-d") . "\n";
+$diff = $date1->diff($date2);
+print "\$date1 after second diff (called at \$date1): " .
+$date1->format("Y-m-d") . "\n";
+print "\$diff->days after second diff: " . $diff->days . "\n";
+$diff = $date2->diff($date1);
+print "\$date1 after third diff (called at \$date2): " .
+$date1->format("Y-m-d") . "\n";
+print "\$diff->days after third diff: " . $diff->days . "\n";
+?>
+--EXPECT--
+$date1 at init: 2009-03-27
+$date2 at init: 2009-03-01
+$date1 after first diff: 2009-03-27
+$diff->days after first diff: 26
+$date1 after sub: 2009-03-25
+$date1 after second diff (called at $date1): 2009-03-25
+$diff->days after second diff: 24
+$date1 after third diff (called at $date2): 2009-03-25
+$diff->days after third diff: 24