From 21f41b06f390ac9cf7ff4df9ec9cdb4ab200a438 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 29 Jul 2008 11:50:23 +0000 Subject: [PATCH] Removed warning --- ext/spl/spl_iterators.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 275a344264..76dd0805b1 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -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); -- 2.50.1