mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-11 05:24:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix tests

Browse Source
This commit is contained in:
Marcus Boerger 2005-11-30 08:14:49 +00:00
parent b36024de5a
commit a71b5970d5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/simplexml/simplexml.c
View File

@ -865,7 +865,7 @@ static HashTable * sxe_properties_get(zval *object TSRMLS_DC)
if (node && sxe->iter.type != SXE_ITER_ATTRLIST) {
if (node->type == XML_ATTRIBUTE_NODE) {
MAKE_STD_ZVAL(value);
ZVAL_STRING(value, sxe_xmlNodeListGetString(node->doc, node->children, 1), 0);
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, sxe_xmlNodeListGetString(node->doc, node->children, 1), 0);
zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
node = NULL;
} else {
@ -878,7 +878,7 @@ static HashTable * sxe_properties_get(zval *object TSRMLS_DC)
} else {
if (node->type == XML_TEXT_NODE) {
MAKE_STD_ZVAL(value);
ZVAL_STRING(value, sxe_xmlNodeListGetString(node->doc, node, 1), 0);
ZVAL_U_STRING(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), value, sxe_xmlNodeListGetString(node->doc, node, 1), 0);
zend_hash_next_index_insert(rv, &value, sizeof(zval *), NULL);
goto next_iter;
}

2
ext/simplexml/tests/023.phpt
View File

@ -39,7 +39,7 @@ object(SimpleXMLElement)#%d (1) {
[u"@attributes"]=>
array(1) {
[u"attr"]=>
string(13) "foo bar baz"
string(%d) "foo%sbar%sbaz"
}
}
object(SimpleXMLElement)#%d (1) {