diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-08-19 18:17:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 18:17:59 +0200 |
| commit | 5fac7d1ddd742ad18d8ee6773ad82950f452f40e (patch) | |
| tree | 0604ad95d34cf199a81d4e61f0d1843188148ce0 /system | |
| parent | b7b5ee6bee6395460a7f628cb16f75b0777ea44b (diff) | |
| parent | abd7e295e65a27ae431641a7bbcbdc9b1fddedf5 (diff) | |
Merge pull request #4777 from tianhe1986/develop_error_handler
Add E_PARSE to errors detected by shutdown handler
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index d66649f59..2c7651943 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -598,7 +598,7 @@ if ( ! function_exists('_error_handler')) */ function _error_handler($severity, $message, $filepath, $line) { - $is_error = (((E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $severity) === $severity); + $is_error = (((E_ERROR | E_PARSE | E_COMPILE_ERROR | E_CORE_ERROR | E_USER_ERROR) & $severity) === $severity); // When an error occurred, set the status header to '500 Internal Server Error' // to indicate to the client something went wrong. |