Upstream Patch: ORM enhancements for PTA

This commit is contained in:
Deon George 2011-05-27 20:40:47 +10:00
parent 6f38322009
commit 7a480dba58

View File

@ -323,7 +323,7 @@ class Kohana_ORM extends Model implements serializable {
else
{
// Passing the primary key
$this->where($this->_table_name.'.'.$this->_primary_key, '=', $id)->find();
$this->where(($this->_disable_join_table_name ? '' : $this->_table_name.'.').$this->_primary_key, '=', $id)->find();
}
}
elseif ( ! empty($this->_cast_data))