com php-src: fix wrong backport: ext/date/php_date.c

From: Date: Sat, 15 Feb 2014 20:41:28 +0000
Subject: com php-src: fix wrong backport: ext/date/php_date.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76077@lists.php.net to get a copy of this message
Commit: f2f78bc05336f4c706b9f104f7c6088c19f9bfa6 Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 21:41:28 +0100 Parents: a005010ef6ce1a3fe27641fd3e1081344c25ca64 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2f78bc05336f4c706b9f104f7c6088c19f9bfa6 Log: fix wrong backport Changed paths: M ext/date/php_date.c Diff: diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ff97de6..78c156d 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2404,7 +2404,7 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC) PHP_DATE_INTERVAL_ADD_PROPERTY("d", d); PHP_DATE_INTERVAL_ADD_PROPERTY("h", h); PHP_DATE_INTERVAL_ADD_PROPERTY("i", i); - PHP_DATE_INTERVAL_ADD_PROPERTY("S", s); + PHP_DATE_INTERVAL_ADD_PROPERTY("s", s); PHP_DATE_INTERVAL_ADD_PROPERTY("weekday", weekday); PHP_DATE_INTERVAL_ADD_PROPERTY("weekday_behavior", weekday_behavior); PHP_DATE_INTERVAL_ADD_PROPERTY("first_last_day_of", first_last_day_of); @@ -3995,7 +3995,7 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze GET_VALUE_FROM_STRUCT(d, "d"); GET_VALUE_FROM_STRUCT(h, "h"); GET_VALUE_FROM_STRUCT(i, "i"); - GET_VALUE_FROM_STRUCT(s, "S"); + GET_VALUE_FROM_STRUCT(s, "s"); GET_VALUE_FROM_STRUCT(invert, "invert"); GET_VALUE_FROM_STRUCT(days, "days"); /* didn't find any */ @@ -4070,7 +4070,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const SET_VALUE_FROM_STRUCT(d, "d"); SET_VALUE_FROM_STRUCT(h, "h"); SET_VALUE_FROM_STRUCT(i, "i"); - SET_VALUE_FROM_STRUCT(s, "S"); + SET_VALUE_FROM_STRUCT(s, "s"); SET_VALUE_FROM_STRUCT(invert, "invert"); /* didn't find any */ (zend_get_std_object_handlers())->write_property(object, member, value, key TSRMLS_CC);

« previous php.cvs (#76077) next »