derick Sun Jul 27 19:10:23 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests date-set-timestamp.phpt
Modified files:
/php-src NEWS
/php-src/ext/date php_date.c
Log:
- MFH: Fixed DateTime::setTimestamp() and added a test for it.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.226&r2=1.2027.2.547.2.965.2.227&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.226
php-src/NEWS:1.2027.2.547.2.965.2.227
--- php-src/NEWS:1.2027.2.547.2.965.2.226 Sun Jul 27 16:27:41 2008
+++ php-src/NEWS Sun Jul 27 19:10:22 2008
@@ -178,7 +178,7 @@
. timezone_location_get() / DateTimezone::getLocation() for retrieving
location information from timezones.
. date_timestamp_set() / DateTime::setTimestamp() to set a Unix timestamp
- without invoking the date parser. (Scott)
+ without invoking the date parser. (Scott, Derick)
. date_timestamp_get() / DateTime::getTimestamp() to retrieve the Unix
timestamp belonging to a date object.
. two optional parameters to timezone_transitions_get() /
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.48&r2=1.43.2.45.2.51.2.49&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.48
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.49
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.48 Sun Jul 20 20:58:51 2008
+++ php-src/ext/date/php_date.c Sun Jul 27 19:10:22 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.48 2008/07/20 20:58:51 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.49 2008/07/27 19:10:22 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3063,7 +3063,7 @@
}
dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
- timelib_unixtime2gmt(dateobj->time, (timelib_sll)timestamp);
+ timelib_unixtime2local(dateobj->time, (timelib_sll)timestamp);
timelib_update_ts(dateobj->time, NULL);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date-set-timestamp.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/date-set-timestamp.phpt
+++ php-src/ext/date/tests/date-set-timestamp.phpt
--TEST--
DateTime::setTimestamp()
--INI--
date.timezone=Europe/Oslo
--FILE--
<?php
$d = new DateTime( '@1217184864' );
echo $d->format( "Y-m-d H:i e\n" );
$d = new DateTime();
$d->setTimestamp( 1217184864 );
echo $d->format( "Y-m-d H:i e\n" );
?>
--EXPECT--
2008-07-27 18:54 +00:00
2008-07-27 20:54 Europe/Oslo
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
