merging 1.2

This commit is contained in:
gwoo 2009-05-04 15:57:10 -07:00
parent 94c01ac7b4
commit 6535e6225c
6 changed files with 39 additions and 9 deletions

View file

@ -1010,7 +1010,10 @@ class Model extends Overloadable {
}
if ($id !== null && $id !== false) {
$this->data = $this->find(array($this->alias . '.' . $this->primaryKey => $id), $fields);
$this->data = $this->find('first', array(
'conditions' => array($this->alias . '.' . $this->primaryKey => $id),
'fields' => $fields
));
return $this->data;
} else {
return false;