From 90d4ae4da8f5a81e136cad26d9612a8f78d14f2d Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Sat, 9 Nov 2013 12:15:37 -0500 Subject: 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. --- ext/json/json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/json/json.c') 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++; -- cgit v1.2.1