deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream Patch: ORM enhancements for PTA

Browse Source
This commit is contained in:
Deon George 2011-05-27 20:40:47 +10:00
parent 6f38322009
commit 7a480dba58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/kohana/modules/orm/classes/kohana/orm.php
View File

@ -323,7 +323,7 @@ class Kohana_ORM extends Model implements serializable {
else else
{ {
// Passing the primary key // 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)) elseif ( ! empty($this->_cast_data))