diff options
author | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
---|---|---|
committer | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
commit | fa337081ced1b1d34805d28f8307f069edf16cdf (patch) | |
tree | 63e524a282d7a8efef45b205c42f9b8e4a06b89b /system/core/Common.php | |
parent | 6bf1e50bdff62d4842cd5a94d324e0768c5ace3e (diff) | |
parent | 78e5fdfe4399975b75b8697f64e270b1799ee2f1 (diff) |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core/Common.php')
-rw-r--r-- | system/core/Common.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index c309d4192..7e93ed46d 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -526,7 +526,8 @@ if ( ! function_exists('_exception_handler')) // Should we display the error? We'll get the current error_reporting // level and add its bits with the severity bits to find out. - if (($severity & error_reporting()) === $severity) + // And respect display_errors + if (($severity & error_reporting()) === $severity && (bool) ini_get('display_errors') === TRUE) { $_error->show_php_error($severity, $message, $filepath, $line); } |