From: Joseph Tate <jtate@php.net>
Date: Thu, 7 Mar 2002 16:34:13 +0000 (+0000)
Subject: Added type attribute wrappers to the remaining node types that did not have
X-Git-Tag: help~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6c9805cc88d7ec6b53cae8e6111526b4eafcf35;p=php

Added type attribute wrappers to the remaining node types that did not have
them.  I.e. XML_ATTRIBUTE_NODE and XML_CDATA_SECTION_NODE.  Mentioned in
Bug #15918.
---

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 9246ab702a..b138bec173 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -1010,6 +1010,7 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
 			object_init_ex(wrapper, domxmlattr_class_entry);
 			rsrc_type = le_domxmlattrp;
 			add_property_stringl(wrapper, "name", (char *) attrp->name, strlen(attrp->name), 1);
+			add_property_long(wrapper, "type", Z_TYPE_P(attrp));
 			content = xmlNodeGetContent((xmlNodePtr) attrp);
 			if (content)
 				add_property_stringl(wrapper, "value", (char *) content, strlen(content), 1);
@@ -1049,6 +1050,7 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
 			xmlDtdPtr dtd = (xmlDtdPtr) obj;
 			object_init_ex(wrapper, domxmldtd_class_entry);
 			rsrc_type = le_domxmldtdp;
+			add_property_long(wrapper, "type", Z_TYPE_P(dtd));
 			if (dtd->ExternalID)
 				add_property_string(wrapper, "publicId", (char *) dtd->ExternalID, 1);
 			if (dtd->SystemID)
@@ -1064,10 +1066,9 @@ static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
 			object_init_ex(wrapper, domxmlcdata_class_entry);
 			rsrc_type = le_domxmlcdatap;
 			content = xmlNodeGetContent(nodep);
-			if (content) {
-				add_property_long(wrapper, "type", Z_TYPE_P(nodep));
+			add_property_long(wrapper, "type", Z_TYPE_P(nodep));
+			if (content)
 				add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1);
-			}
 			break;
 		}