summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Richards <rrichards@php.net>2003-06-12 17:04:28 +0000
committerRob Richards <rrichards@php.net>2003-06-12 17:04:28 +0000
commit2b8fcfbeab591c72d660036b4f82706e8d5f34b8 (patch)
tree227ff988aac33d8b432a4ba4def842732ae12647
parent2d4449caf9cc96084bcd5c3343c8f1b8cf495068 (diff)
downloadphp-git-2b8fcfbeab591c72d660036b4f82706e8d5f34b8.tar.gz
fix some calls to libxml
-rw-r--r--ext/dom/characterdata.c6
-rw-r--r--ext/dom/text.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index 4a9ec2860a..0ed5dffa27 100644
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@@ -140,7 +140,7 @@ PHP_FUNCTION(dom_characterdata_substring_data)
return;
}
- cur = xmlNodeListGetString(node->doc, node, 1);
+ cur = xmlNodeGetContent(node);
if (cur == NULL) {
RETURN_FALSE;
}
@@ -264,7 +264,7 @@ PHP_FUNCTION(dom_characterdata_delete_data)
return;
}
- cur = xmlNodeListGetString(node->doc, node, 1);
+ cur = xmlNodeGetContent(node);
if (cur == NULL) {
RETURN_FALSE;
}
@@ -321,7 +321,7 @@ PHP_FUNCTION(dom_characterdata_replace_data)
return;
}
- cur = xmlNodeListGetString(node->doc, node, 1);
+ cur = xmlNodeGetContent(node);
if (cur == NULL) {
RETURN_FALSE;
}
diff --git a/ext/dom/text.c b/ext/dom/text.c
index 68461ccd5d..0f0b9ab1e2 100644
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -150,6 +150,8 @@ PHP_FUNCTION(dom_text_split_text)
nnode->type = XML_ELEMENT_NODE;
xmlAddNextSibling(node, nnode);
nnode->type = XML_TEXT_NODE;
+ } else {
+ dom_add_to_list(nnode, intern TSRMLS_CC);
}
return_value = php_dom_create_object(nnode, &ret, NULL, return_value, intern TSRMLS_CC);