chregu Mon Oct 27 10:32:23 2003 EDT
Modified files:
/php-src/ext/dom document.c dom_fe.h
Log:
xinclude support readded to ext/dom
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.34 php-src/ext/dom/document.c:1.35
--- php-src/ext/dom/document.c:1.34 Sun Oct 26 19:03:28 2003
+++ php-src/ext/dom/document.c Mon Oct 27 10:32:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.34 2003/10/27 00:03:28 chregu Exp $ */
+/* $Id: document.c,v 1.35 2003/10/27 15:32:22 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -81,6 +81,7 @@
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)
@@ -1510,6 +1511,28 @@
}
}
/* }}} 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
Index: php-src/ext/dom/dom_fe.h
diff -u php-src/ext/dom/dom_fe.h:1.6 php-src/ext/dom/dom_fe.h:1.7
--- php-src/ext/dom/dom_fe.h:1.6 Sun Oct 5 16:45:26 2003
+++ php-src/ext/dom/dom_fe.h Mon Oct 27 10:32:22 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dom_fe.h,v 1.6 2003/10/05 20:45:26 shane Exp $ */
+/* $Id: dom_fe.h,v 1.7 2003/10/27 15:32:22 chregu Exp $ */
#ifndef DOM_FE_H
#define DOM_FE_H
@@ -126,6 +126,7 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
