mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
adding fix for generate list to 1.2
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3703 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
6d572a2b2b
commit
d485edd1ab
1 changed files with 4 additions and 2 deletions
|
@ -1564,8 +1564,10 @@ class Model extends Overloadable {
|
||||||
} else {
|
} else {
|
||||||
$fields = null;
|
$fields = null;
|
||||||
}
|
}
|
||||||
|
if($this->recursive >= 1) {
|
||||||
$result = $this->findAll($conditions, $fields, $order, $limit, 1, 0);
|
$this->recursive = -1;
|
||||||
|
}
|
||||||
|
$result = $this->findAll($conditions, $fields, $order, $limit);
|
||||||
|
|
||||||
if ($keyPath == null) {
|
if ($keyPath == null) {
|
||||||
$keyPath = '{n}.' . $this->name . '.' . $this->primaryKey;
|
$keyPath = '{n}.' . $this->name . '.' . $this->primaryKey;
|
||||||
|
|
Loading…
Add table
Reference in a new issue