Merge branch 'master' into 2.5

This commit is contained in:
mark_story 2014-01-05 15:45:09 -05:00
commit 5fd8883691

View file

@ -91,7 +91,7 @@ class ExceptionRenderer {
public function __construct(Exception $exception) { public function __construct(Exception $exception) {
$this->controller = $this->_getController($exception); $this->controller = $this->_getController($exception);
if (method_exists($this->controller, 'apperror')) { if (method_exists($this->controller, 'appError')) {
return $this->controller->appError($exception); return $this->controller->appError($exception);
} }
$method = $template = Inflector::variable(str_replace('Exception', '', get_class($exception))); $method = $template = Inflector::variable(str_replace('Exception', '', get_class($exception)));