summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2002-04-11 22:52:43 +0000
committerMarcus Boerger <helly@php.net>2002-04-11 22:52:43 +0000
commitfffb1a5d21948960adeb2976372562dd389ce4dd (patch)
tree18534db194a16957a5e9bd83dfa373bacbba3f40
parent995e6f6af02da934d95b77531225ecd886a2aa56 (diff)
downloadphp-git-fffb1a5d21948960adeb2976372562dd389ce4dd.tar.gz
interpret empty to_encoding as encoding not set what results in current_internal_encoding
-rw-r--r--ext/mbstring/mbstring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index cfd3bfdf65..63394d7bdc 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2070,7 +2070,7 @@ PHPAPI char * php_mb_convert_encoding(char *input, size_t length, char *_to_enco
return NULL;
}
/* new encoding */
- if (_to_encoding) {
+ if (_to_encoding && strlen(_to_encoding)) {
to_encoding = mbfl_name2no_encoding(_to_encoding);
if (to_encoding == mbfl_no_encoding_invalid) {
php_error(E_WARNING, "%s() unknown encoding \"%s\"",