diff options
| author | Marcus Boerger <helly@php.net> | 2005-07-19 19:46:21 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2005-07-19 19:46:21 +0000 |
| commit | 897090c01ed81790118767577431e331dcb9a98e (patch) | |
| tree | 21a5477039960371398ed7aeb5414692201cfad1 /Zend/zend_interfaces.c | |
| parent | 27c24383eea4a3fe7291ef0461e25a987019d8d9 (diff) | |
| download | php-git-897090c01ed81790118767577431e331dcb9a98e.tar.gz | |
- Dont't warn in case an exception is pending - in this case it'd superflous
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rwxr-xr-x | Zend/zend_interfaces.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index 133e3cbbd1..891c51404f 100755 --- a/Zend/zend_interfaces.c +++ b/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) { |