diff --git a/ext/dom/node.c b/ext/dom/node.c index 887d6d8009070..5b955c06f3d93 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -930,7 +930,6 @@ int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC) { xmlNode *nodep = dom_object_get_node(obj); zval value_copy; - xmlChar *enc_str; if (nodep == NULL) { php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); @@ -938,9 +937,9 @@ int dom_node_text_content_write(dom_object *obj, zval *newval TSRMLS_DC) } convert_to_string_copy(newval, value_copy); - enc_str = xmlEncodeEntitiesReentrant(nodep->doc, Z_STRVAL_P(newval)); - xmlNodeSetContent(nodep, enc_str); - xmlFree(enc_str); + /* we have to use xmlNodeAddContent() to get the same behavior as with xmlNewText() */ + xmlNodeSetContent(nodep, (xmlChar *) ""); + xmlNodeAddContent(nodep, Z_STRVAL_P(newval)); if (newval == &value_copy) { zval_dtor(newval); } diff --git a/ext/dom/tests/bug70001.phpt b/ext/dom/tests/bug70001.phpt new file mode 100644 index 0000000000000..7a8c291d4b228 --- /dev/null +++ b/ext/dom/tests/bug70001.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #70001 (Assigning to DOMNode::textContent does additional entity encoding) +--SKIPIF-- + +--FILE-- +foo & bar

'); +var_dump($element->textContent); +$element = (new DOMDocument())->createTextNode('

foo & bar

'); +var_dump($element->textContent); +$element->textContent = ('

foo & bar

'); +var_dump($element->textContent); +?> +--EXPECT-- +string(16) "

foo & bar

" +string(16) "

foo & bar

" +string(16) "

foo & bar

"