Merge pull request #915 from bar/master-cake-error

Avoid duplicating RequestHandler component when rendering Errors.
This commit is contained in:
Mark Story 2012-10-25 17:24:00 -07:00
commit e6512c56fd

View file

@ -50,7 +50,11 @@ class CakeErrorController extends AppController {
*/
public function __construct($request = null, $response = null) {
parent::__construct($request, $response);
if (count(Router::extensions())) {
if (
count(Router::extensions()) &&
!array_key_exists('RequestHandler', $this->components) &&
!in_array('RequestHandler', $this->components, true)
) {
$this->components[] = 'RequestHandler';
}
$this->constructClasses();