From 7a480dba58dfe45c20ba5060c064cd504a6bc784 Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 27 May 2011 20:40:47 +1000 Subject: [PATCH] Upstream Patch: ORM enhancements for PTA --- includes/kohana/modules/orm/classes/kohana/orm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/kohana/modules/orm/classes/kohana/orm.php b/includes/kohana/modules/orm/classes/kohana/orm.php index f028833..ace966a 100644 --- a/includes/kohana/modules/orm/classes/kohana/orm.php +++ b/includes/kohana/modules/orm/classes/kohana/orm.php @@ -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))