fix some calls to libxml

Rob Richards · Rob Richards · commit 2b8fcfbeab59 · 2003-06-12T17:04:28.000Z
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ PHP_FUNCTION(dom_characterdata_substring_data)`
`140`	`140`	`return;`
`141`	`141`	`}`
`142`	`142`
`143`		`- cur = xmlNodeListGetString(node->doc, node, 1);`
	`143`	`+ cur = xmlNodeGetContent(node);`
`144`	`144`	`if (cur == NULL) {`
`145`	`145`	`RETURN_FALSE;`
`146`	`146`	`}`
`@@ -264,7 +264,7 @@ PHP_FUNCTION(dom_characterdata_delete_data)`
`264`	`264`	`return;`
`265`	`265`	`}`
`266`	`266`
`267`		`- cur = xmlNodeListGetString(node->doc, node, 1);`
	`267`	`+ cur = xmlNodeGetContent(node);`
`268`	`268`	`if (cur == NULL) {`
`269`	`269`	`RETURN_FALSE;`
`270`	`270`	`}`
`@@ -321,7 +321,7 @@ PHP_FUNCTION(dom_characterdata_replace_data)`
`321`	`321`	`return;`
`322`	`322`	`}`
`323`	`323`
`324`		`- cur = xmlNodeListGetString(node->doc, node, 1);`
	`324`	`+ cur = xmlNodeGetContent(node);`
`325`	`325`	`if (cur == NULL) {`
`326`	`326`	`RETURN_FALSE;`
`327`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,8 @@ PHP_FUNCTION(dom_text_split_text)`
`150`	`150`	`nnode->type = XML_ELEMENT_NODE;`
`151`	`151`	`xmlAddNextSibling(node, nnode);`
`152`	`152`	`nnode->type = XML_TEXT_NODE;`
	`153`	`+ } else {`
	`154`	`+ dom_add_to_list(nnode, intern TSRMLS_CC);`
`153`	`155`	`}`
`154`	`156`
`155`	`157`	`return_value = php_dom_create_object(nnode, &ret, NULL, return_value, intern TSRMLS_CC);`