adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-05-30 11:23:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
This commit is contained in:
mark_story 2012-10-27 21:13:53 -04:00
commit c24bec679b
20 changed files with 230 additions and 145 deletions
lib/Cake/Controller
CakeErrorController.php

6
lib/Cake/Controller/CakeErrorController.php
View file

@ -51,7 +51,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();