diff options
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index b52b3ff5f3..c130105ae8 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -42,10 +42,12 @@ static const char digits[] = "0123456789abcdef"; #define PHP_JSON_HEX_QUOT (1<<3) /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_json_encode, 0, 0, 1) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() +static ZEND_BEGIN_ARG_INFO_EX(arginfo_json_decode, 0, 0, 1) ZEND_ARG_INFO(0, json) ZEND_ARG_INFO(0, assoc) @@ -209,9 +211,6 @@ static void json_encode_array(smart_str *buf, zval **val, int options TSRMLS_DC) if (i == HASH_KEY_IS_STRING) { if (key[0] == '\0' && Z_TYPE_PP(val) == IS_OBJECT) { /* Skip protected and private members. */ - if (tmp_ht) { - tmp_ht->nApplyCount--; - } continue; } |