diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-31 09:40:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-31 09:40:01 +0100 |
| commit | 9c5ab992ac2b4996811468db69eab499777070a2 (patch) | |
| tree | 167615de67fd98e870ea76615960bceb33b5d1ee /Zend/zend_execute.c | |
| parent | 839bdf12ee476ceeb9b0d71696e6e1fc3c14197c (diff) | |
| parent | 340c6d392720f4681a46b58cfe9a002ce5b7e8b6 (diff) | |
| download | php-git-9c5ab992ac2b4996811468db69eab499777070a2.tar.gz | |
Merge branch 'PHP-7.4'
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 39f6122ac9..db47aaa9e5 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3749,8 +3749,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); } } |