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:
gwoo 2006-10-18 01:07:09 +00:00
parent 6d572a2b2b
commit d485edd1ab

View file

@ -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;