Merge branch 'PHP-7.0' into PHP-7.1

This commit is contained in:
Nikita Popov 2016-08-30 17:21:13 +02:00
commit b218eb916f
3 changed files with 26 additions and 0 deletions

View file

@ -2115,6 +2115,7 @@ static void add_xml_array_elements(xmlNodePtr xmlParam,
if (j >= dims[0]) {
break;
}
ZVAL_DEREF(zdata);
if (dimension == 1) {
if (enc == NULL) {
xparam = master_to_xml(get_conversion(Z_TYPE_P(zdata)), zdata, style, xmlParam);