Permalink
Browse files

Renamed fatal error handler configuration for follow the same logic o…

…f consoleHandler name.
  • Loading branch information...
1 parent eeec217 commit 05cdae6d1a4602e6f6d6f025b93949412c38c29c @jrbasso jrbasso committed Apr 1, 2012
Showing with 7 additions and 7 deletions.
  1. +3 −3 app/Config/core.php
  2. +3 −3 lib/Cake/Console/Templates/skel/Config/core.php
  3. +1 −1 lib/Cake/Core/App.php
View
@@ -41,8 +41,8 @@
*
* Options:
*
- * - `handleFatalError` - callback - The callback to handle fatal errors. You can set this to any
- * callback type, including anonymous functions.
+ * - `fatalErrorHandler` - callback - The callback to handle fatal errors. You can set this to any
+ * callback type, including anonymous functions. Setting it to false will disable the feature.
* - `handler` - callback - The callback to handle errors. You can set this to any callback type,
* including anonymous functions.
* - `level` - int - The level of errors you are interested in capturing.
@@ -51,7 +51,7 @@
* @see ErrorHandler for more information on error handling and configuration.
*/
Configure::write('Error', array(
- 'handleFatalError' => 'ErrorHandler::handleFatalError',
+ 'fatalErrorHandler' => 'ErrorHandler::handleFatalError',
'handler' => 'ErrorHandler::handleError',
'level' => E_ALL & ~E_DEPRECATED,
'trace' => true
@@ -41,8 +41,8 @@
*
* Options:
*
- * - `handleFatalError` - callback - The callback to handle fatal errors. You can set this to any
- * callback type, including anonymous functions.
+ * - `fatalErrorHandler` - callback - The callback to handle fatal errors. You can set this to any
+ * callback type, including anonymous functions. Setting it to false will disable the feature.
* - `handler` - callback - The callback to handle errors. You can set this to any callback type,
* including anonymous functions.
* - `level` - int - The level of errors you are interested in capturing.
@@ -51,7 +51,7 @@
* @see ErrorHandler for more information on error handling and configuration.
*/
Configure::write('Error', array(
- 'handleFatalError' => 'ErrorHandler::handleFatalError',
+ 'fatalErrorHandler' => 'ErrorHandler::handleFatalError',
'handler' => 'ErrorHandler::handleError',
'level' => E_ALL & ~E_DEPRECATED,
'trace' => true
View
@@ -913,7 +913,7 @@ protected static function _checkFatalError() {
return;
}
- $fatalErrorHandler = Configure::read('Error.handleFatalError');
+ $fatalErrorHandler = Configure::read('Error.fatalErrorHandler');
if (!is_callable($fatalErrorHandler)) {
return;
}

0 comments on commit 05cdae6

Please sign in to comment.