diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-31 09:39:10 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-31 09:39:10 +0100 |
| commit | 340c6d392720f4681a46b58cfe9a002ce5b7e8b6 (patch) | |
| tree | 0c67c475cd7c42cc242adf273b2a3a948184ff50 /Zend/zend_execute.c | |
| parent | abd36289e26cc0365e82373699aba4c1ffff464d (diff) | |
| download | php-git-340c6d392720f4681a46b58cfe9a002ce5b7e8b6.tar.gz | |
Revert "Don't silence fatal errors with @"
This reverts commit abd36289e26cc0365e82373699aba4c1ffff464d.
This wasn't ready for merging yet, there are still some test
failures.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 03c621f08f..2b832b6f0d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3755,8 +3755,7 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, } } else if (kind == ZEND_LIVE_SILENCE) { /* restore previous error_reporting value */ - if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting)) - && !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(var))) { + if (!EG(error_reporting) && Z_LVAL_P(var) != 0) { EG(error_reporting) = Z_LVAL_P(var); } } |