[PHP-CVS] cvs: php4 /ext/dom characterdata.c text.c

[Rob Richards]

rrichards               Thu Jun 12 13:04:28 2003 EDT

  Modified files:              
    /php4/ext/dom       text.c characterdata.c 
  Log:
  fix some calls to libxml
  
Index: php4/ext/dom/text.c
diff -u php4/ext/dom/text.c:1.8 php4/ext/dom/text.c:1.9
--- php4/ext/dom/text.c:1.8     Wed Jun 11 16:06:03 2003
+++ php4/ext/dom/text.c Thu Jun 12 13:04:28 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: text.c,v 1.8 2003/06/11 20:06:03 rrichards Exp $ */
+/* $Id: text.c,v 1.9 2003/06/12 17:04:28 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -150,6 +150,8 @@
                nnode->type = XML_ELEMENT_NODE;
                xmlAddNextSibling(node, nnode);
                nnode->type = XML_TEXT_NODE;
+       } else {
+               dom_add_to_list(nnode, intern TSRMLS_CC);
        }
        
        return_value = php_dom_create_object(nnode, &ret, NULL, return_value, intern 
TSRMLS_CC);
Index: php4/ext/dom/characterdata.c
diff -u php4/ext/dom/characterdata.c:1.4 php4/ext/dom/characterdata.c:1.5
--- php4/ext/dom/characterdata.c:1.4    Wed Jun 11 07:25:08 2003
+++ php4/ext/dom/characterdata.c        Thu Jun 12 13:04:28 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: characterdata.c,v 1.4 2003/06/11 11:25:08 rrichards Exp $ */
+/* $Id: characterdata.c,v 1.5 2003/06/12 17:04:28 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -140,7 +140,7 @@
                return;
        }
 
-       cur = xmlNodeListGetString(node->doc, node, 1);
+       cur = xmlNodeGetContent(node);
        if (cur == NULL) {
                RETURN_FALSE;
        }
@@ -264,7 +264,7 @@
                return;
        }
 
-       cur = xmlNodeListGetString(node->doc, node, 1);
+       cur = xmlNodeGetContent(node);
        if (cur == NULL) {
                RETURN_FALSE;
        }
@@ -321,7 +321,7 @@
                return;
        }
 
-       cur = xmlNodeListGetString(node->doc, node, 1);
+       cur = xmlNodeGetContent(node);
        if (cur == NULL) {
                RETURN_FALSE;
        }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php