]> granicus.if.org Git - php/commitdiff
Removed warning
authorDmitry Stogov <dmitry@php.net>
Tue, 29 Jul 2008 11:50:23 +0000 (11:50 +0000)
committerDmitry Stogov <dmitry@php.net>
Tue, 29 Jul 2008 11:50:23 +0000 (11:50 +0000)
ext/spl/spl_iterators.c

index 275a34426433bbf94e299a8976b84c7908c10e0e..76dd0805b188ccd40e49c649ca5d0ee043779213 100755 (executable)
@@ -931,7 +931,10 @@ static void spl_recursive_tree_iterator_get_entry(spl_recursive_it_object * obje
 
        php_set_error_handling(EH_THROW, spl_ce_UnexpectedValueException TSRMLS_CC);
        RETVAL_ZVAL(*data, 1, 0);
-       if (Z_TYPE_PP(data) != IS_UNICODE && Z_TYPE_PP(data) != IS_STRING) {
+       if (Z_TYPE_P(return_value) == IS_ARRAY) {
+               zval_dtor(return_value);
+               ZVAL_STRINGL(return_value, "Array", sizeof("Array")-1, 1);
+       } else if (Z_TYPE_PP(data) != IS_UNICODE && Z_TYPE_PP(data) != IS_STRING) {
                convert_to_text(return_value);
        }
        php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);