helly Tue Jul 19 15:46:22 2005 EDT
Modified files:
/ZendEngine2 zend_interfaces.c
Log:
- Dont't warn in case an exception is pending - in this case it'd superflous
http://cvs.php.net/diff.php/ZendEngine2/zend_interfaces.c?r1=1.31&r2=1.32&ty=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.31 ZendEngine2/zend_interfaces.c:1.32
--- ZendEngine2/zend_interfaces.c:1.31 Tue Apr 5 05:16:27 2005
+++ ZendEngine2/zend_interfaces.c Tue Jul 19 15:46:21 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_interfaces.c,v 1.31 2005/04/05 09:16:27 helly Exp $ */
+/* $Id: zend_interfaces.c,v 1.32 2005/07/19 19:46:21 helly Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -193,7 +193,10 @@
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) {
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
