summaryrefslogtreecommitdiff
path: root/Zend/zend_API.h
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2015-03-22 09:17:42 +0100
committerNikita Popov <nikic@php.net>2015-03-22 09:17:42 +0100
commitccfd53886f3f9aefc72c18c9a40b8e2b3015955b (patch)
treee5e842da85e976a1ecf10ac26cabc84f3e1f72b9 /Zend/zend_API.h
parentd4da7c20d2d642a6f0f81bde836576b9970969af (diff)
downloadphp-git-ccfd53886f3f9aefc72c18c9a40b8e2b3015955b.tar.gz
Revert "Use E_ERROR | E_EXCEPTION in FAST_ZPP mode too"
This reverts commit d4da7c20d2d642a6f0f81bde836576b9970969af. The argument passed to this function refers to the weak mode severity, strict mode will get an exception in any case.
Diffstat (limited to 'Zend/zend_API.h')
-rw-r--r--Zend/zend_API.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index d97b3760de..bd90e953fe 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -757,7 +757,7 @@ ZEND_API void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, cha
if (UNEXPECTED(error_code != ZPP_ERROR_OK)) { \
if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \
- zend_wrong_callback_error(E_ERROR | E_EXCEPTION, _i, _error); \
+ zend_wrong_callback_error(E_WARNING, _i, _error); \
} else if (error_code == ZPP_ERROR_WRONG_CLASS) { \
zend_wrong_paramer_class_error(_i, _error, _arg); \
} else if (error_code == ZPP_ERROR_WRONG_ARG) { \