Index: branches/5.0.x/core/install.php
===================================================================
diff -u -r12559 -r12587
--- branches/5.0.x/core/install.php	(.../install.php)	(revision 12559)
+++ branches/5.0.x/core/install.php	(.../install.php)	(revision 12587)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 12559 2009-09-17 18:57:44Z alex $
+* @version	$Id: install.php 12587 2009-09-22 12:01:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -522,7 +522,10 @@
 					}
 
 					// check interface module
-					if (!in_array('core', $modules)) {
+					$upgrade_data = $this->GetUpgradableModules();
+
+					if (array_key_exists('core', $upgrade_data) && !in_array('core', $modules)) {
+						// core can be upgraded, but isn't selected
 						$this->errorMessage = 'Please select "Core" as interface module';
 					}
 
@@ -583,6 +586,9 @@
 
 						// set module "Core" version after install (based on upgrade scripts)
 						$this->toolkit->SetModuleVersion('Core');
+
+						// for now we set "In-Portal" module version to "Core" module version (during clean install)
+						$this->toolkit->SetModuleVersion('In-Portal', $this->toolkit->GetMaxModuleVersion('Core'));
 					}
 					break;
 
@@ -883,6 +889,11 @@
 							// after upgrade sqls are executed update version and upgrade language pack
 							$this->toolkit->SetModuleVersion($module_name, $module_info['ToVersion']);
 						}
+
+						// for now we set "In-Portal" module version to "Core" module version (during upgrade)
+						if (in_array('core', $modules)) {
+							$this->toolkit->SetModuleVersion('In-Portal', $upgrade_data['core']['ToVersion']);
+						}
 					}
 					break;