mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
fixing issue with plugins in primary components introduced in [7745]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7749 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
f51ae718e6
commit
0a8274332a
1 changed files with 4 additions and 1 deletions
|
@ -78,7 +78,6 @@ class Component extends Object {
|
|||
if (!in_array('Session', $controller->components)) {
|
||||
array_unshift($controller->components, 'Session');
|
||||
}
|
||||
$this->_primary = array_keys(Set::normalize($controller->components));
|
||||
$this->_loadComponents($controller);
|
||||
}
|
||||
/**
|
||||
|
@ -223,6 +222,10 @@ class Component extends Object {
|
|||
}
|
||||
}
|
||||
|
||||
if ($parent === null) {
|
||||
$this->_primary[] = $component;
|
||||
}
|
||||
|
||||
if (isset($this->_loaded[$component])) {
|
||||
$object->{$component} =& $this->_loaded[$component];
|
||||
|
||||
|
|
Loading…
Reference in a new issue