diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-10-21 15:30:31 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-10-21 15:30:31 +0200 |
| commit | 4ffe6345690f81872d0937e562faaf75f3185b6a (patch) | |
| tree | 8695ad99bef9308d5d4dab16692ef2f7f5207928 /system/core | |
| parent | 6513701f21e72fadbbadc4bfea501dd871fa5149 (diff) | |
Fix #4865
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Common.php | 1 | ||||
| -rw-r--r-- | system/core/Exceptions.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 257763dd3..91c585f7d 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -661,6 +661,7 @@ if ( ! function_exists('_exception_handler')) $_error =& load_class('Exceptions', 'core'); $_error->log_exception('error', 'Exception: '.$exception->getMessage(), $exception->getFile(), $exception->getLine()); + is_cli() OR set_status_header(500); // Should we display the error? if (str_ireplace(array('off', 'none', 'no', 'false', 'null'), '', ini_get('display_errors'))) { diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index a1c6a1970..4e10f2831 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -207,7 +207,6 @@ class CI_Exceptions { } else { - set_status_header(500); $templates_path .= 'html'.DIRECTORY_SEPARATOR; } |