Minor fixes to ssl and core

2011-12-30 10:54:54 +11:00
parent 4a68621fc7
commit 125407656d
9 changed files with 77 additions and 13 deletions
--- a/application/classes/orm.php
+++ b/application/classes/orm.php
@@ -124,6 +124,7 @@ class ORM extends Kohana_ORM {
 			->from($this->_has_many[$alias]['through'])
 			->where($this->_has_many[$alias]['foreign_key'], '=', $this->pk())
 			->where($this->_has_many[$alias]['far_key'], 'IN', $far_keys)
+			->where('site_id', '=', Config::siteid())
 			->execute($this->_db)->get('records_found');
 	}
 }