cvs: ZendEngine2 / zend.c
| From: | Zeev Suraski | Date: | Thu, 15 Jan 2004 16:47:32 +0000 |
| Subject: | cvs: ZendEngine2 / zend.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2212@lists.php.net to get a copy of this message | ||
zeev Thu Jan 15 11:47:32 2004 EDT
Modified files:
/ZendEngine2 zend.c
Log:
Nice patch Christian, but it wasn't at all enabled? :)
Fix bug #26883
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.264 ZendEngine2/zend.c:1.265
--- ZendEngine2/zend.c:1.264 Thu Jan 8 12:31:47 2004
+++ ZendEngine2/zend.c Thu Jan 15 11:47:32 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.264 2004/01/08 17:31:47 sniper Exp $ */
+/* $Id: zend.c,v 1.265 2004/01/15 16:47:32 zeev Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -909,7 +909,8 @@
va_start(args, format);
/* if we don't have a user defined error handler */
- if (!EG(user_error_handler)) {
+ if (!EG(user_error_handler)
+ || !(EG(user_error_handler_error_reporting) & type)) {
zend_error_cb(type, error_filename, error_lineno, format, args);
} else switch (type) {
case E_ERROR: