- MFH Fix error message

helly25 · helly25 · commit 2d1d47639136 · 2006-01-23T02:26:32.000Z
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -859,7 +859,7 @@ static inline spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME
 			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(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(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;

Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,7 @@ static inline spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME`
`859`	`859`	`if (((flags & CIT_CALL_TOSTRING) && (flags & (CIT_TOSTRING_USE_KEY\|CIT_TOSTRING_USE_CURRENT)))`
`860`	`860`	`\|\| ((flags & (CIT_TOSTRING_USE_KEY\|CIT_TOSTRING_USE_CURRENT)) == (CIT_TOSTRING_USE_KEY\|CIT_TOSTRING_USE_CURRENT))) {`
`861`	`861`	`php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);`
`862`		`- zend_throw_exception(spl_ce_InvalidArgumentException, "Flags must contain only one of CIT_CALL_TOSTRING, CIT_TOSTRING_USE_KEY, CIT_TOSTRING_USE_CURRENT", 0 TSRMLS_CC);`
	`862`	`+ zend_throw_exception(spl_ce_InvalidArgumentException, "Flags must contain only one of CATCH_GET_CHILD, CALL_TOSTRING, TOSTRING_USE_KEY, TOSTRING_USE_CURRENT", 0 TSRMLS_CC);`
`863`	`863`	`return NULL;`
`864`	`864`	`}`
`865`	`865`	`intern->u.caching.flags \|= flags & CIT_PUBLIC;`