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

index be9a58bcf3d66496d4c91462fae3875a50ff6d1b..8d3ecafe5ac4883534c0a47bb09487be95039016 100755 (executable)
@@ -924,7 +924,12 @@ 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);
-       convert_to_string(return_value);
+       if (Z_TYPE_P(return_value) == IS_ARRAY) {
+               zval_dtor(return_value);
+               ZVAL_STRINGL(return_value, "Array", sizeof("Array")-1, 1);
+       } else {
+               convert_to_string(return_value);
+       }
        php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
 }