adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-07 12:02:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0-exceptions' into 2.0

Browse source 
Conflicts:
	cake/libs/error.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/error.test.php
This commit is contained in:
mark_story 2010-09-10 20:31:16 -04:00
commit e4d34b640b
58 changed files with 1679 additions and 1599 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cake/console/libs/acl.php
View file

@ -91,7 +91,8 @@ class AclShell extends Shell {
require_once (CONFIGS.'database.php');
if (!in_array($this->command, array('initdb'))) {
$this->Acl =& new AclComponent();
$collection = new ComponentCollection();
$this->Acl =& new AclComponent($collection);
$controller = null;
$this->Acl->startup($controller);
}