cvs: php4(PHP_4_2_0) /ext/domxml php_domxml.c

jtate Thu Mar 7 13:53:59 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/domxml php_domxml.c Log: Reverting the reverted patch. I hope this is the last time. No added functionality. Just a bug fix of #15918 Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.118.2.2 php4/ext/domxml/php_domxml.c:1.118.2.3 --- php4/ext/domxml/php_domxml.c:1.118.2.2 Thu Mar 7 13:47:25 2002 +++ php4/ext/domxml/php_domxml.c Thu Mar 7 13:53:55 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.118.2.2 2002/03/07 18:47:25 jtate Exp $ */ +/* $Id: php_domxml.c,v 1.118.2.3 2002/03/07 18:53:55 jtate Exp $ */ /* TODO * - Support Notation Nodes @@ -1010,6 +1010,7 @@ 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 @@ 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 @@ 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; }