From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 29 Jul 2008 11:50:23 +0000 (+0000)
Subject: Removed warning
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~978
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21f41b06f390ac9cf7ff4df9ec9cdb4ab200a438;p=php

Removed warning
---

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);