diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-07-10 10:27:04 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-07-10 10:27:04 +0200 |
| commit | c25d9aa24c02a02afd1165d598c3d6d4383ac9e1 (patch) | |
| tree | f997b8a3972f8661e117d8ab6b34e5fc471f501a /system/core | |
| parent | d73d6a88eb6ad34c82dd72026233093907499bfa (diff) | |
| parent | f3b7fa268d0c10c43e48952c44ad617167c0e387 (diff) | |
Merge pull request #1548 from chrisguiney/error_reporting
Respect display_errors when deciding if to display an error...
Diffstat (limited to 'system/core')
| -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); } |