iliaa Fri May 23 15:46:24 2008 UTC Modified files: /php-src/ext/simplexml simplexml.c Log: MFB:When dumping entire document to file via asXml() don't lose the encoding http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.254&r2=1.255&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.254 php-src/ext/simplexml/simplexml.c:1.255 --- php-src/ext/simplexml/simplexml.c:1.254 Sat May 3 15:09:24 2008 +++ php-src/ext/simplexml/simplexml.c Fri May 23 15:46:24 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.254 2008/05/03 15:09:24 colder Exp $ */ +/* $Id: simplexml.c,v 1.255 2008/05/23 15:46:24 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1392,7 +1392,7 @@ if (node) { if (node->parent && (XML_DOCUMENT_NODE == node->parent->type)) { - xmlDocDumpMemory((xmlDocPtr) sxe->document->ptr, &strval, &strval_len); + xmlDocDumpMemoryEnc((xmlDocPtr) sxe->document->ptr, &strval, &strval_len, ((xmlDocPtr) sxe->document->ptr)->encoding); RETVAL_STRINGL((char *)strval, strval_len, 1); xmlFree(strval); } else { @@ -2560,7 +2560,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.254 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.255 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php