fix some calls to libxml

diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c
index 4a9ec2860aaa1ed8bb720aa5c55b8941031ec70c..0ed5dffa27ade6d18c249ed13c6f61a080a224e6 100644 (file)
--- 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 68461ccd5d5c675384cc419eace5668cbe469cf8..0f0b9ab1e20fc7b7f4443d06f40ed0a25a8a7d77 100644 (file)
--- 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);