diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 08:27:43 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 08:27:43 +0200 |
| commit | 97c5172ac78c056ba28199d907259376e7c3c3a2 (patch) | |
| tree | c27d0e0c2cb845a492530f9e7fe6be29da5a602a /ext/xml/xml.c | |
| parent | 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (diff) | |
| parent | 53c4c571b3d3b7891526ff616e69c4d74a04afe5 (diff) | |
| download | php-git-97c5172ac78c056ba28199d907259376e7c3c3a2.tar.gz | |
Merge remote-tracking branch 'php/master'
Conflicts:
ext/date/lib/parse_date.c
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index dd88f4b226..0bde50a24d 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -383,7 +383,7 @@ static void _xml_xmlchar_zval(const XML_Char *s, int len, const XML_Char *encodi if (len == 0) { len = _xml_xmlcharlen(s); } - ZVAL_STRINGL(ret, (char *)s, len); + ZVAL_STR(ret, xml_utf8_decode(s, len, encoding)); } /* }}} */ |