Fixed bug #20934 (htmlspecialchars returns latin1 from UTF-8)

diff --git a/ext/standard/html.c b/ext/standard/html.c
index b2d69cbc463664e0656e1ee1fffe49aad3a56648..944cbfc239b6cd9f49b7b0652c7b55560e25be5d 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -801,11 +801,10 @@ PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newle
 
                        }
                        if (!is_basic) {
-                               if (this_char > 0xff) {
-                                       /* a wide char without a named entity; pass through the original sequence */
+                               /* a wide char without a named entity; pass through the original sequence */
+                               if (mbseqlen > 1) {
                                        memcpy(replaced + len, mbsequence, mbseqlen);
                                        len += mbseqlen;
-
                                } else {
                                        replaced[len++] = (unsigned char)this_char;
                                }