diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-04 12:48:17 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-04 12:48:17 +0100 |
| commit | c85f12e3aca8d1da64504018e421a766ab66e574 (patch) | |
| tree | f172075948aa1fb75a7d56ffca4078485c2cbf7d /ext/json/json.c | |
| parent | 539fd6591591c78692848387210dcabb76b163f8 (diff) | |
| download | php-git-c85f12e3aca8d1da64504018e421a766ab66e574.tar.gz | |
Revert "json_decode() should generate a syntax error when given ""."
This reverts commit a7b3abe4e6f5e2fdfd8d55b676c9ca6b3f9c8cc8.
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 27aed969d9..5b71eb06f6 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -818,7 +818,6 @@ static PHP_FUNCTION(json_decode) JSON_G(error_code) = 0; if (!str_len) { - JSON_G(error_code) = PHP_JSON_ERROR_SYNTAX; RETURN_NULL(); } |