summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-08-02 16:31:53 +0000
committerfoobar <sniper@php.net>2005-08-02 16:31:53 +0000
commit9f6e05964f815f74c6115ca6f27d61ee6787c7c5 (patch)
treedfa96096bfda65d4948c386f68284c3149f1e341
parent3593a55341aafb2a4b5428243b796a49bf8059f5 (diff)
downloadphp-git-9f6e05964f815f74c6115ca6f27d61ee6787c7c5.tar.gz
- Fixed bug #33967 (misuse of Exception constructor doesn\'t display errorfile)
-rw-r--r--NEWS2
-rw-r--r--Zend/zend_exceptions.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 55cecbb6c6..2ef0b0791e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.1
+- Fixed bug #33967 (misuse of Exception constructor doesn't display errorfile).
+ (Jani)
- Fixed bug #33917 (number_format() output with > 1 char separators). (Jani)
- Fixed bug #33904 (input array keys being escaped when magic quotes is off).
(Ilia)
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index f428c3cb74..1f5a83e95f 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -132,7 +132,7 @@ ZEND_METHOD(exception, __construct)
int argc = ZEND_NUM_ARGS(), message_len;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|sl", &message, &message_len, &code) == FAILURE) {
- zend_error(E_CORE_ERROR, "Wrong parameter count for exception([string $exception [, long $code ]])");
+ zend_error(E_ERROR, "Wrong parameter count for exception([string $exception [, long $code ]])");
}
object = getThis();
@@ -158,7 +158,7 @@ ZEND_METHOD(error_exception, __construct)
int argc = ZEND_NUM_ARGS(), message_len, filename_len;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|sllsl", &message, &message_len, &code, &severity, &filename, &filename_len, &lineno) == FAILURE) {
- zend_error(E_CORE_ERROR, "Wrong parameter count for exception([string $exception [, long $code ]])");
+ zend_error(E_ERROR, "Wrong parameter count for exception([string $exception [, long $code ]])");
}
object = getThis();