diff options
| author | johannes <johannes@php.net> | 2012-07-05 00:55:47 +0200 |
|---|---|---|
| committer | johannes <johannes@php.net> | 2012-07-05 00:55:47 +0200 |
| commit | bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a (patch) | |
| tree | cfef529c6f5127d2ea82e2cb5577291cfc4f47d6 /ext/json/json.c | |
| parent | d80ff391899f7aead3b9b9c6c084adba8a8203ba (diff) | |
| download | php-git-bcc87ba68ede7b90cd544ec0911bdbe5d844aa2a.tar.gz | |
Revert change 3f3ad30c50: There shouldn't be new features in 5.3, especially
not if they aren't in 5.4, too.
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index ce2cf43fcc..5b62c2feea 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -73,7 +73,6 @@ static PHP_MINIT_FUNCTION(json) REGISTER_LONG_CONSTANT("JSON_HEX_QUOT", PHP_JSON_HEX_QUOT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_FORCE_OBJECT", PHP_JSON_FORCE_OBJECT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_NUMERIC_CHECK", PHP_JSON_NUMERIC_CHECK, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("JSON_PARTIAL_OUTPUT_ON_ERROR", PHP_JSON_PARTIAL_OUTPUT_ON_ERROR, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_ERROR_NONE", PHP_JSON_ERROR_NONE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("JSON_ERROR_DEPTH", PHP_JSON_ERROR_DEPTH, CONST_CS | CONST_PERSISTENT); @@ -321,7 +320,9 @@ static void json_escape_string(smart_str *buf, char *s, int len, int options TSR } if (len < 0) { JSON_G(error_code) = PHP_JSON_ERROR_UTF8; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid UTF-8 sequence in argument"); + if (!PG(display_errors)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid UTF-8 sequence in argument"); + } smart_str_appendl(buf, "null", 4); } else { smart_str_appendl(buf, "\"\"", 2); @@ -570,11 +571,7 @@ static PHP_FUNCTION(json_encode) php_json_encode(&buf, parameter, options TSRMLS_CC); - if (JSON_G(error_code) != PHP_JSON_ERROR_NONE && options ^ PHP_JSON_PARTIAL_OUTPUT_ON_ERROR) { - ZVAL_FALSE(return_value); - } else { - ZVAL_STRINGL(return_value, buf.c, buf.len, 1); - } + ZVAL_STRINGL(return_value, buf.c, buf.len, 1); smart_str_free(&buf); } |