From 5ffa395307a3b26f901dde5f3064c48a15979f0d Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 22 Apr 2013 14:21:45 +1000 Subject: [PATCH] Leenooks customisations for Kohana --- modules/orm/classes/Kohana/ORM.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/orm/classes/Kohana/ORM.php b/modules/orm/classes/Kohana/ORM.php index 6da6763..666af8a 100644 --- a/modules/orm/classes/Kohana/ORM.php +++ b/modules/orm/classes/Kohana/ORM.php @@ -690,7 +690,8 @@ class Kohana_ORM extends Model implements serializable { $join_col1 = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['far_key']; $join_col2 = ($this->_disable_join_table_name ? '' : $model->_object_name.'.').$model->_primary_key; - $model->join($through)->on($join_col1, '=', $join_col2); + $model->join($through)->on($join_col1, '=', $join_col2) + ->on(($this->_disable_join_table_name ? '' : $through.'.').'site_id', '=', ($this->_disable_join_table_name ? '' : $model->_object_name.'.').'site_id'); // Through table's source foreign key (foreign_key) should be this model's primary key $col = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['foreign_key'];