summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-04-01 22:05:35 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-04-01 22:05:35 +0000
commit962c8cc9ef964c80dad21060af327d53113dd714 (patch)
tree53c3fa7df04d72958d05bf85740ea041e76842d8
parentb2ed70e4e08baeef9fd60ab77c735967bbaae95e (diff)
downloadphp-git-962c8cc9ef964c80dad21060af327d53113dd714.tar.gz
Fixed reversed condition for error reporting.
-rw-r--r--Zend/tests/bug27731.phpt4
-rw-r--r--Zend/zend_execute.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/tests/bug27731.phpt b/Zend/tests/bug27731.phpt
index 0c72d43504..408e4242ad 100644
--- a/Zend/tests/bug27731.phpt
+++ b/Zend/tests/bug27731.phpt
@@ -3,8 +3,8 @@ Bug #27731 (error_reporing() call inside @ block does not work correctly)
--FILE--
<?php
error_reporting(E_ALL ^ E_NOTICE);
- @error_reporting(0);
+ @error_reporting(E_WARNING);
var_dump(error_reporting());
?>
--EXPECT--
-int(0)
+int(2)
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 7a365194f9..57cd4e8f18 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -4096,7 +4096,7 @@ int zend_end_silence_handler(ZEND_OPCODE_HANDLER_ARGS)
{
zval restored_error_reporting;
- if (EG(error_reporting)) {
+ if (!EG(error_reporting)) {
restored_error_reporting.type = IS_LONG;
restored_error_reporting.value.lval = EX_T(opline->op1.u.var).tmp_var.value.lval;
convert_to_string(&restored_error_reporting);