helly Mon Jan 23 02:26:15 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
- Fix error message
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.110&r2=1.111&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.110
php-src/ext/spl/spl_iterators.c:1.111
--- php-src/ext/spl/spl_iterators.c:1.110 Wed Jan 18 23:39:00 2006
+++ php-src/ext/spl/spl_iterators.c Mon Jan 23 02:26:15 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.110 2006/01/18 23:39:00 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.111 2006/01/23 02:26:15 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -871,7 +871,7 @@
if (((flags & CIT_CALL_TOSTRING) && (flags &
(CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT)))
|| ((flags &
(CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT)) ==
(CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT))) {
php_set_error_handling(EH_NORMAL, NULL
TSRMLS_CC);
-
zend_throw_exception(U_CLASS_ENTRY(spl_ce_InvalidArgumentException), "Flags
must contain only one of CIT_CALL_TOSTRING, CIT_TOSTRING_USE_KEY,
CIT_TOSTRING_USE_CURRENT", 0 TSRMLS_CC);
+
zend_throw_exception(U_CLASS_ENTRY(spl_ce_InvalidArgumentException), "Flags
must contain only one of CATCH_GET_CHILD, CALL_TOSTRING, TOSTRING_USE_KEY,
TOSTRING_USE_CURRENT", 0 TSRMLS_CC);
return NULL;
}
intern->u.caching.flags |= flags & CIT_PUBLIC;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
