Site setup fixes

application/classes/orm.php

@@ -40,7 +40,7 @@ class ORM extends Kohana_ORM {
 	// Add our OSB site_id to each SELECT query
 	final protected function _build($type) {
 		// Exclude tables without site ID's
-		if (! in_array($this->_table_name,array('setup','country','currency','tax')))
+		if (! in_array($this->_table_name,Config::$no_site_id_tables))
 			$this->where($this->_table_name.'.site_id','=',Config::siteid());
 
 		return parent::_build($type);