Permalink
Browse files

- Dont't warn in case an exception is pending - in this case it'd sup…

…erflous
  • Loading branch information...
1 parent 27c2438 commit 897090c01ed81790118767577431e331dcb9a98e Marcus Boerger committed Jul 19, 2005
Showing with 4 additions and 1 deletion.
  1. +4 −1 Zend/zend_interfaces.c
@@ -193,7 +193,10 @@ static int zend_user_it_get_current_key(zend_object_iterator *_iter, char **str_
if (!retval) {
*int_key = 0;
- zend_error(E_WARNING, "Nothing returned from %s::key()", iter->ce->name);
+ if (!EG(exception))
+ {
+ zend_error(E_WARNING, "Nothing returned from %s::key()", iter->ce->name);
+ }
return HASH_KEY_IS_LONG;
}
switch (retval->type) {

0 comments on commit 897090c

Please sign in to comment.