diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-24 22:39:59 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-24 22:39:59 +0300 |
| commit | ad4fa8f75810facff8bea509249a735232235443 (patch) | |
| tree | 13b4b2f3df2a2df85a8d3b9702024ac8213f37a7 /ext/date/php_date.c | |
| parent | abf6a0b376b42e0ce60da039b11c6fdf994431fb (diff) | |
| download | php-git-ad4fa8f75810facff8bea509249a735232235443.tar.gz | |
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 4b74da0971..50c48eb439 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2780,7 +2780,7 @@ PHP_METHOD(DateTime, __set_state) RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); php_date_instantiate(date_ce_date, return_value); dateobj = Z_PHPDATE_P(return_value); @@ -2802,7 +2802,7 @@ PHP_METHOD(DateTimeImmutable, __set_state) RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); php_date_instantiate(date_ce_immutable, return_value); dateobj = Z_PHPDATE_P(return_value); @@ -3699,7 +3699,7 @@ PHP_METHOD(DateTimeZone, __set_state) RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); php_date_instantiate(date_ce_timezone, return_value); tzobj = Z_PHPTIMEZONE_P(return_value); @@ -4161,7 +4161,7 @@ PHP_METHOD(DateInterval, __set_state) RETURN_FALSE; } - myht = HASH_OF(array); + myht = Z_ARRVAL_P(array); php_date_instantiate(date_ce_interval, return_value); intobj = Z_PHPINTERVAL_P(return_value); @@ -4570,7 +4570,7 @@ PHP_FUNCTION(timezone_abbreviations_list) add_assoc_null_ex(&element, "timezone_id", sizeof("timezone_id") - 1); } - abbr_array_p = zend_hash_str_find(HASH_OF(return_value), entry->name, strlen(entry->name)); + abbr_array_p = zend_hash_str_find(Z_ARRVAL_P(return_value), entry->name, strlen(entry->name)); if (!abbr_array_p) { array_init(&abbr_array); add_assoc_zval(return_value, entry->name, &abbr_array); |