Skip to content
Permalink
Browse files

Moving where AppError is used, as infinite recursion is no fun.

  • Loading branch information...
markstory committed Sep 3, 2010
1 parent f2db197 commit 8c428ff8a89a33c4165026cd58e38b7e8b537c39
Showing with 10 additions and 6 deletions.
  1. +10 −6 cake/libs/error_handler.php
@@ -99,10 +99,6 @@ function __construct(Exception $exception) {
if (method_exists($this->controller, 'apperror')) {
return $this->controller->appError($exception);
}
if (file_exists(APP . 'app_error.php') && class_exists('AppError')) {
$AppError = new AppError($exception);
return $AppError->render();
}
$method = $template = Inflector::variable(str_replace('Exception', '', get_class($exception)));
if ($exception instanceof CakeException && !in_array($method, get_class_methods($this))) {
@@ -155,13 +151,21 @@ protected function _getController($exception) {
/**
* Set as the default exception handler by the CakePHP bootstrap process.
* If you wish you use a custom default exception handler use set_exception_handler()
* in your app/config/bootstrap.php.
*
* This will either use an AppError class if your application has one,
* or use the default ErrorHandler.
*
* @return void
* @see http://php.net/manual/en/function.set-exception-handler.php
*/
public static function handleException(Exception $exception) {
if (file_exists(APP . 'app_error.php') || class_exists('AppError')) {
if (!class_exists('AppError')) {
require(APP . 'app_error.php');
}
$AppError = new AppError($exception);
return $AppError->render();
}
$error = new ErrorHandler($exception);
$error->render();
}

0 comments on commit 8c428ff

Please sign in to comment.
You can’t perform that action at this time.