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 | |
| parent | d73d6a88eb6ad34c82dd72026233093907499bfa (diff) | |
| parent | f3b7fa268d0c10c43e48952c44ad617167c0e387 (diff) | |
Merge pull request #1548 from chrisguiney/error_reporting
Respect display_errors when deciding if to display an error...
| -rw-r--r-- | system/core/Common.php | 3 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 3 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); } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index f02892419..f3c5cf72a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -186,6 +186,7 @@ Release Date: Not Released - Core + - _exception_handler now respects php.ini's display_errors - Changed private methods in the :doc:`URI Library <libraries/uri>` to protected so MY_URI can override them. - Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions). - Added method get_vars() to the :doc:`Loader Library <libraries/loader>` to retrieve all variables loaded with $this->load->vars(). |