Merge branch 'PHP-5.5' into PHP-5.6

This commit is contained in:
Xinchen Hui committed 2015-03-25 12:09:35 +08:00
commit 86bbacfd53
1 file changed
+1 -1
+1 -1
View File
@@ -462,7 +462,7 @@ static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, xml
xmlNodeSetName(node, BAD_CAST(Z_STRVAL_PP(zname)));
}
if (zend_hash_find(ht, "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS &&
Z_TYPE_PP(zname) == IS_STRING) {
Z_TYPE_PP(znamens) == IS_STRING) {
xmlNsPtr nsp = encode_add_ns(node, Z_STRVAL_PP(znamens));
xmlSetNs(node, nsp);
}