diff options
| author | Derick Rethans <derick@php.net> | 2010-03-07 17:25:16 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2010-03-07 17:25:16 +0000 |
| commit | 02e46447864a975bdb714e9d783503fd6506eece (patch) | |
| tree | b3bc2c1ec454693a6b239d77522af7819da2a397 | |
| parent | dbec5439b57d5630fc8a4a529981572b3957eb48 (diff) | |
| download | php-git-02e46447864a975bdb714e9d783503fd6506eece.tar.gz | |
- Fixed bug #49059 (DateTime::diff() repeats previous sub() operation).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/date/php_date.c | 2 | ||||
| -rw-r--r-- | ext/date/tests/bug49059.phpt | 34 |
3 files changed, 38 insertions, 0 deletions
@@ -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 afd09cd5d4..0cc86feeb7 100644 --- 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 index 0000000000..48d2dacb21 --- /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 |