chregu Sat Dec 13 06:36:15 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
Log:
fix for bug #26595 "`XSLT_NAMESPACE' undeclared"
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.43
php-src/ext/domxml/php_domxml.c:1.218.2.44
--- php-src/ext/domxml/php_domxml.c:1.218.2.43 Fri Dec 5 14:21:05 2003
+++ php-src/ext/domxml/php_domxml.c Sat Dec 13 06:36:14 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.43 2003/12/05 19:21:05 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.44 2003/12/13 11:36:14 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -200,9 +200,8 @@
#endif
#if HAVE_DOMXSLT
zend_class_entry *domxsltstylesheet_class_entry;
-#endif
-
static int xslt_has_xsl_keys (xmlDocPtr doc);
+#endif
static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC);
static int node_children(zval **children, xmlNode *nodep TSRMLS_DC);
@@ -4683,21 +4682,6 @@
/* }}} */
#endif
-static int xslt_has_xsl_keys (xmlDocPtr doc) {
-
- xmlNode *nodep;
- nodep = xmlDocGetRootElement(doc)->children;
- while (nodep) {
- if (nodep->type == XML_ELEMENT_NODE && xmlStrEqual(nodep->name, "key")
&& xmlStrEqual(nodep->ns->href, XSLT_NAMESPACE)) {
- return 1;
- break;
- }
- nodep = nodep->next;
- }
- return 0;
-}
-
-
/* {{{ int node_attributes(zval **attributes, int node)
Returns list of children nodes */
static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC)
@@ -5341,6 +5325,21 @@
}
/* }}} */
+static int xslt_has_xsl_keys (xmlDocPtr doc) {
+
+ xmlNode *nodep;
+ nodep = xmlDocGetRootElement(doc)->children;
+ while (nodep) {
+ if (nodep->type == XML_ELEMENT_NODE && xmlStrEqual(nodep->name, "key")
&& xmlStrEqual(nodep->ns->href, XSLT_NAMESPACE)) {
+ return 1;
+ break;
+ }
+ nodep = nodep->next;
+ }
+ return 0;
+}
+
+
/* {{{ proto object domxml_xslt_process(object xslstylesheet, object xmldoc [, array
xslt_parameters [, bool xpath_parameters [, string profileFilename]]])
Perform an XSLT transformation */
PHP_FUNCTION(domxml_xslt_process)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
