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

…f consoleHandler name.
cakephp · Apr 14, 2012 · 05cdae6 · 05cdae6
1 parent eeec217
commit 05cdae6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/Config/core.php b/app/Config/core.php
@@ -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

diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php
@@ -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

diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
@@ -913,7 +913,7 @@ protected static function _checkFatalError() {
 			return;
 		}
 
-		$fatalErrorHandler = Configure::read('Error.handleFatalError');
+		$fatalErrorHandler = Configure::read('Error.fatalErrorHandler');
 		if (!is_callable($fatalErrorHandler)) {
 			return;
 		}