Index: branches/5.1.x/core/units/themes/theme_item.php
===================================================================
diff -u -N -r13168 -r13559
--- branches/5.1.x/core/units/themes/theme_item.php	(.../theme_item.php)	(revision 13168)
+++ branches/5.1.x/core/units/themes/theme_item.php	(.../theme_item.php)	(revision 13559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: theme_item.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: theme_item.php 13559 2010-05-12 09:36:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -20,13 +20,30 @@
 		{
 			$default = false;
 			if ($id == 'default') {
-				$id = 1;
-				$id_field_name = 'PrimaryTheme';
+				// domain based primary theme
+				$id = $this->Application->siteDomainField('PrimaryThemeId');
+
+				if (!$id) {
+					$id = 1;
+					$id_field_name = 'PrimaryTheme';
+				}
+
 				$default = true;
 			}
 
 			$res = parent::Load($id, $id_field_name, true);
 
+			if ($res) {
+				$available_themes = $this->Application->siteDomainField('Themes');
+
+				if ($available_themes) {
+					if (strpos($available_themes, '|' . $this->GetID() . '|') === false) {
+						// theme isn't allowed in site domain
+						return $this->Clear();
+					}
+				}
+			}
+
 			if ($default) {
 				if (!$res) {
 					if ($this->Application->isAdmin) {