diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-05-03 19:55:55 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-05-03 19:55:55 +0100 |
| commit | afb4062c2c66d3080c08693af47c670bb63c285e (patch) | |
| tree | 4c860a31501a3dadf59c0b9322f7f52764ae75d3 /ext/json/json.c | |
| parent | 37048c0f6cef53b015c04c8370f94e6597588fdc (diff) | |
| parent | 34a9882ad357620ccec2bfadba72fce027acd3d6 (diff) | |
| download | php-git-afb4062c2c66d3080c08693af47c670bb63c285e.tar.gz | |
Merge branch 'json_parser_method' into json_parser_method_embed
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index bd7c0b0c1b..d3c6111d4d 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -254,7 +254,7 @@ static PHP_FUNCTION(json_decode) return; } - JSON_G(error_code) = 0; + JSON_G(error_code) = PHP_JSON_ERROR_NONE; if (!str_len) { JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX; |