tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity

FIX Only suppress fatal errors

Browse Source
This commit is contained in:
Hamish Friedlander 2013-07-22 14:48:16 +12:00
parent 604d9bf7dc
commit 84011aa736
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/startup/ErrorControlChain.php
View File

@ -18,6 +18,8 @@
* It will likely be heavily refactored before the release of 3.2
*/
class ErrorControlChain {
public static $fatal_errors = null; // Initialised after class definition
protected $error = false;
protected $steps = array();
@ -67,8 +69,12 @@ class ErrorControlChain {
}
public function handleError($errno, $errstr) {
if ((error_reporting() & $errno) == $errno && $this->suppression) throw new Exception('Generic Error');
else return false;
if ((error_reporting() & self::$fatal_errors & $errno) != 0 && $this->suppression) {
throw new Exception('Generic Error');
}
else {
return false;
}
}
protected function lastErrorWasFatal() {
@ -117,3 +123,6 @@ class ErrorControlChain {
}
}
}
ErrorControlChain::$fatal_errors = E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR;
if (defined('E_RECOVERABLE_ERROR')) ErrorControlChain::$fatal_errors |= E_RECOVERABLE_ERROR;