summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-07-12 12:51:11 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-07-12 12:51:11 +0200
commit6648da07a4dc001d5e9d2c16e501d563e7fa2118 (patch)
tree4b7f1a2a6da31111711291be1cc173ab35b619bf /system/core
parenta44cf574132ae9332ab68ddbcda8849e3e71c54b (diff)
parent7ac09978c2fb2cae07f6998e245cda3aaa2e1230 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index c309d4192..06b162264 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -172,7 +172,7 @@ if ( ! function_exists('load_class'))
if ($name === FALSE)
{
// Note: We use exit() rather then show_error() in order to avoid a
- // self-referencing loop with the Excptions class
+ // self-referencing loop with the Exceptions class
set_status_header(503);
exit('Unable to locate the specified class: '.$class.'.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);
}