Updates from AER.ORIG

modules/orm/classes/Kohana/ORM.php

@@ -690,8 +690,7 @@ 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'];