rrichards               Fri Dec 17 07:20:51 2004 EDT

  Modified files:              
    /php-src/ext/xml    compat.c 
  Log:
  Fixed bug #31139 (XML Parser Functions seem to drop & when parsing)
  
http://cvs.php.net/diff.php/php-src/ext/xml/compat.c?r1=1.38&r2=1.39&ty=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.38 php-src/ext/xml/compat.c:1.39
--- php-src/ext/xml/compat.c:1.38       Sun Nov 21 09:25:15 2004
+++ php-src/ext/xml/compat.c    Fri Dec 17 07:20:50 2004
@@ -280,7 +280,8 @@
 
                if (ret == NULL || (parser->parser->instate != 
XML_PARSER_ENTITY_VALUE && parser->parser->instate != 
XML_PARSER_ATTRIBUTE_VALUE)) {
                        if (ret == NULL || ret->etype == 
XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || 
ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {
-                               if (parser->h_default) {
+                               /* Predefined entities will expand unless no 
cdata handler is present */
+                               if (parser->h_default && ! (ret && ret->etype 
== XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {
                                        xmlChar *entity;
                                        int      len;
                                        

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

Reply via email to