summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-08-19 18:17:59 +0200
committerAndrey Andreev <narf@devilix.net>2016-08-19 18:20:05 +0200
commitc114deba71fdbbb0b7087696960f15e5ae0a08c5 (patch)
tree92a5b5f58daf97209a32a2e9655cee939022d155 /system/core
parent15a5e0db1fc00ad26516bd92f3c476bcc77fe5fe (diff)
Merge pull request #4777 from tianhe1986/develop_error_handler
Add E_PARSE to errors detected by shutdown handler
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php2
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.