Index: branches/5.0.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r12719 -r12733
--- branches/5.0.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12719)
+++ branches/5.0.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12733)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 12719 2009-10-20 14:30:29Z alex $
+* @version	$Id: install_toolkit.php 12733 2009-10-20 18:57:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -27,10 +27,10 @@
 	define('PREREQUISITE_FILE', FULL_PATH.'/%sinstall/prerequisites.php');
 
 	/**
-	 * Format of version identificator in upgrade files
+	 * Format of version identificator in upgrade files (normal, beta, release candidate)
 	 *
 	 */
-	define('VERSION_MARK', '# ===== v ([\d]+\.[\d]+\.[\d]+) =====');
+	define('VERSION_MARK', '# ===== v ([\d]+\.[\d]+\.[\d]+|[\d]+\.[\d]+\.[\d]+-B[\d]+|[\d]+\.[\d]+\.[\d]+-RC[\d]+) =====');
 
 	if (!defined('GET_LICENSE_URL')) {
 		/**
@@ -370,18 +370,37 @@
 		}
 
 		/**
-		 * Converts module version in format X.Y.Z to signle integer
+		 * Converts module version in format X.Y.Z[-BN/-RCM] to signle integer
 		 *
 		 * @param string $version
 		 * @return int
 		 */
 		function ConvertModuleVersion($version)
 		{
-			$parts = explode('.', $version);
+			if (preg_match('/(.*)-(B|RC)([\d]+)/', $version, $regs)) {
+				// -B<M> or RC-<N>
+				$parts = explode('.', $regs[1]);
 
+				$parts[] = $regs[2] == 'B' ? 1 : 2; // B reliases goes before RC releases
+				$parts[] = $regs[3];
+			}
+			else {
+				// releases without B/RC marks go after any B/RC releases
+				$parts = explode('.', $version . '.3.100');
+			}
+
 			$bin = '';
-			foreach ($parts as $part) {
-				$bin .= str_pad(decbin($part), 8, '0', STR_PAD_LEFT);
+
+			foreach ($parts as $part_index => $part) {
+				if ($part_index == 3) {
+					// version type only can be 1/2/3 (11 in binary form), so don't use padding at all
+					$pad_count = 2;
+				}
+				else {
+					$pad_count = 8;
+				}
+
+				$bin .= str_pad(decbin($part), $pad_count, '0', STR_PAD_LEFT);
 			}
 
 			return bindec($bin);
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -N -r12703 -r12733
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12703)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12733)
@@ -1507,7 +1507,7 @@
 
 UPDATE Modules SET Loaded = 1 WHERE `Name` = 'In-Portal';
 
-# ===== v 5.0.2 =====
+# ===== v 5.0.2-B1 =====
 ALTER TABLE PortalGroup DROP ResourceId;
 
 ALTER TABLE Category