diff options
| author | Adam Harvey <aharvey@php.net> | 2013-11-09 12:15:37 -0500 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-11-09 12:15:37 -0500 |
| commit | 90d4ae4da8f5a81e136cad26d9612a8f78d14f2d (patch) | |
| tree | 114923026d9343257f19a722f11473a7785e5e9d /ext/json | |
| parent | 43cb6ba7639aacf08f5e6a46428b12f5df303f6f (diff) | |
| download | php-git-90d4ae4da8f5a81e136cad26d9612a8f78d14f2d.tar.gz | |
Make all code paths in json_determine_array_type() return constants.
This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/json.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 782375e371..90ca50dae9 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -190,10 +190,10 @@ static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */ } if (i == HASH_KEY_IS_STRING) { - return 1; + return PHP_JSON_OUTPUT_OBJECT; } else { if (index != idx) { - return 1; + return PHP_JSON_OUTPUT_OBJECT; } } idx++; |