summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorChristopher Guiney <chris@guiney.net>2012-06-29 06:34:21 +0200
committerChristopher Guiney <chris@guiney.net>2012-06-29 06:34:21 +0200
commit94e36fd06f5ade974cf16a7eedbf960bc3ad27ba (patch)
treeeeb5770fa7ee7d526836297c22d827036a0451d4 /system/core
parent7db0f597c78cd5485b566d9cd6e3935a8489c540 (diff)
Respect display_errors when deciding if to display an error -- useful for environments where you want to log errors, but not show them.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index c309d4192..1e78761e6 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);
}