Index: branches/5.1.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r13168 -r13189
--- branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13168)
+++ branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13189)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: install_toolkit.php 13189 2010-03-10 10:37:47Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -185,12 +185,18 @@
 		 * Sets module version to passed
 		 *
 		 * @param string $module_name
+		 * @param string $module_path
 		 * @param string $version
 		 */
-		function SetModuleVersion($module_name, $version = false)
+		function SetModuleVersion($module_name, $module_path = false, $version = false)
 		{
 			if ($version === false) {
-				$version = $this->GetMaxModuleVersion($module_name);
+				if (!$module_path) {
+					trigger_error('Module path must be given to "SetModuleVersion" method to auto-detect version', E_USER_ERROR);
+					return ;
+				}
+
+				$version = $this->GetMaxModuleVersion($module_path);
 			}
 
 			// get table prefix from config, because application may not be available here
@@ -234,9 +240,11 @@
 		 * @param string $module_name
 		 * @return string
 		 */
-		function GetMaxModuleVersion($module_name)
+		function GetMaxModuleVersion($module_path)
 		{
-			$upgrades_file = sprintf(UPGRADES_FILE, mb_strtolower($module_name).'/', 'sql');
+			$module_path = rtrim(mb_strtolower($module_path), '/');
+			$upgrades_file = sprintf(UPGRADES_FILE, $module_path . '/', 'sql');
+
 			if (!file_exists($upgrades_file)) {
 				// no upgrade file
 				return '5.0.0';
@@ -815,12 +823,12 @@
 		 */
 		function finalizeModuleInstall($module_folder, $refresh_permissions = false)
 		{
+			$this->SetModuleVersion(basename($module_folder), $module_folder);
+
 			if (!$this->Application->GetVar('redirect')) {
 				return ;
 			}
 
-			$this->SetModuleVersion($module_folder);
-
 			$this->deleteCache($refresh_permissions);
 
 			$url_params = Array (