dmitry Tue Jul 29 11:50:23 2008 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
Removed warning
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.174&r2=1.175&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.174
php-src/ext/spl/spl_iterators.c:1.175
--- php-src/ext/spl/spl_iterators.c:1.174 Tue Jul 22 22:54:14 2008
+++ php-src/ext/spl/spl_iterators.c Tue Jul 29 11:50:23 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.174 2008/07/22 22:54:14 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.175 2008/07/29 11:50:23 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -931,7 +931,10 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
