diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-05-03 19:55:41 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-05-03 19:55:41 +0100 |
| commit | 34a9882ad357620ccec2bfadba72fce027acd3d6 (patch) | |
| tree | d531877fdae8ec4126e8042ca350dcfcdb8b770f /ext/json/json.c | |
| parent | 93b67dd511fdf890931e2b18846886368798ca5a (diff) | |
| parent | ee551106bc11d6ac2eb277b810c9b8bb90e318bc (diff) | |
| download | php-git-34a9882ad357620ccec2bfadba72fce027acd3d6.tar.gz | |
Merge branch 'master' into json_parser_method
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; |