xinclude support readded to ext/dom

diff --git a/ext/dom/document.c b/ext/dom/document.c
index 9e56a62beee3cc45d1fd5e9f6e6bfd1a67229945..bb19a9257762f15b36e059dd8e3079fcba9ab99a 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -81,6 +81,7 @@ zend_function_entry php_dom_document_class_functions[] = {
        PHP_FALIAS(saveXML, dom_document_savexml, NULL)
        PHP_FALIAS(domdocument, dom_document_document, NULL)
        PHP_FALIAS(validate, dom_document_validate, NULL)
+       PHP_FALIAS(xinclude, dom_document_xinclude, NULL)
 #if defined(LIBXML_HTML_ENABLED)
        PHP_FALIAS(loadHTML, dom_document_load_html, NULL)
        PHP_FALIAS(loadHTMLFile, dom_document_load_html_file, NULL)
@@ -1511,6 +1512,28 @@ PHP_FUNCTION(dom_document_savexml)
 }
 /* }}} end dom_document_savexml */
 
+/* {{{ proto int dom_document_xinclude()
+   Substitutues xincludes in a DomDocument */
+PHP_FUNCTION(dom_document_xinclude)
+{
+       zval *id;
+       xmlDoc *docp;
+       int err; 
+       dom_object *intern;
+
+       DOM_GET_THIS_OBJ(docp, id, xmlDocPtr, intern);
+
+       err = xmlXIncludeProcess (docp);
+       
+       if (err) {
+               RETVAL_LONG(err);
+       } else {
+               RETVAL_FALSE;
+       }
+    
+}
+
+
 /* {{{ proto string domnode dom_document_validate();
 Since: DOM extended
 */

diff --git a/ext/dom/dom_fe.h b/ext/dom/dom_fe.h
index c5a8b450c3bae9c72e76be911536633024a8d65a..26edda384e1ddf117a98ce3e96ef85f74c6e4029 100644 (file)
--- a/ext/dom/dom_fe.h
+++ b/ext/dom/dom_fe.h
@@ -126,6 +126,7 @@ PHP_FUNCTION(dom_document_save);
 PHP_FUNCTION(dom_document_loadxml);
 PHP_FUNCTION(dom_document_savexml);
 PHP_FUNCTION(dom_document_validate);
+PHP_FUNCTION(dom_document_xinclude);
 
 #if defined(LIBXML_HTML_ENABLED)
 PHP_FUNCTION(dom_document_load_html);