diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-04-22 21:41:52 -0700 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-04-22 21:41:52 -0700 |
| commit | fa5f28a0a176ecf9b7617eb24b757620a5355ca6 (patch) | |
| tree | 96da473b96b002f6ed5007efb46219edbeeca513 /ext/json/json.c | |
| parent | 67947d0fda85a8383a5018f3aa7a17a61d521cdf (diff) | |
| parent | 589d0e0f187ff82f90110057f624c958f0d3ec86 (diff) | |
| download | php-git-fa5f28a0a176ecf9b7617eb24b757620a5355ca6.tar.gz | |
Merge branch 'PHP-7.0'
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; |