diff options
| author | Anatol Belski <ab@php.net> | 2014-12-23 17:33:30 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-23 17:33:30 +0100 |
| commit | e46852d2d5b7f2a2b9282978103da3aea36ab07d (patch) | |
| tree | 0e6e3754355e5370d3691d5e59dae82f18aa4cd6 | |
| parent | e2e5ed06d1e6a7cc0c7148ada9768a0c0aa16313 (diff) | |
| download | php-git-e46852d2d5b7f2a2b9282978103da3aea36ab07d.tar.gz | |
better fix for script encoding ini
| -rw-r--r-- | Zend/zend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 6913d51193..942b0a0c59 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -89,13 +89,13 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /* {{{ */ static ZEND_INI_MH(OnUpdateScriptEncoding) /* {{{ */ { - if (!CG(multibyte) || !new_value) { + if (!CG(multibyte)) { return FAILURE; } if (!zend_multibyte_get_functions()) { return SUCCESS; } - return zend_multibyte_set_script_encoding_by_string(new_value->val, new_value->len); + return zend_multibyte_set_script_encoding_by_string(new_value ? new_value->val : NULL, new_value ? new_value->len : 0); } /* }}} */ |