mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Merging fix when using Controller::persistModel = true and a requestAction method is used
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3911 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
87af38c7dc
commit
ca5f7d952c
1 changed files with 3 additions and 1 deletions
|
@ -300,7 +300,9 @@ class Controller extends Object {
|
||||||
loadModels();
|
loadModels();
|
||||||
uses('neat_array');
|
uses('neat_array');
|
||||||
} elseif($this->uses === false) {
|
} elseif($this->uses === false) {
|
||||||
loadModel($this->modelClass);
|
if(!class_exists($this->modelClass)){
|
||||||
|
loadModel($this->modelClass);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (class_exists($this->modelClass) && ($this->uses === false)) {
|
if (class_exists($this->modelClass) && ($this->uses === false)) {
|
||||||
|
|
Loading…
Reference in a new issue