Index: branches/5.1.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12657)
+++ branches/5.1.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: install_toolkit.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
@@ -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')) {
 		/**
@@ -301,6 +301,7 @@
 
 			$sqls = str_replace('CREATE TABLE ', 'CREATE TABLE IF NOT EXISTS ' . $table_prefix, $sqls);
 			$sqls = str_replace('DROP TABLE ', 'DROP TABLE IF EXISTS ' . $table_prefix, $sqls);
+			$sqls = str_replace('<%TABLE_PREFIX%>', $table_prefix, $sqls);
 
 			if (isset($replace_from) && isset($replace_to)) {
 				// replace something additionally, e.g. module root category
@@ -370,18 +371,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);
@@ -403,7 +423,8 @@
 			$table_name = $this->Application->getUnitOption('theme', 'TableName');
 
 			$sql = 'SELECT Name, ' . $id_field . '
-					FROM ' . $table_name . 'ORDER BY Name ASC';
+					FROM ' . $table_name . '
+					ORDER BY Name ASC';
 			return $this->Conn->GetCol($sql, $id_field);
 		}
 
@@ -769,9 +790,11 @@
 		function deleteCache($refresh_permissions = false)
 		{
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Cache
-					WHERE VarName IN ("config_files", "configs_parsed", "sections_parsed", "cms_menu", "StructureTree")';
+					WHERE VarName IN ("config_files", "configs_parsed", "sections_parsed")';
 			$this->Conn->Query($sql);
 
+			$this->Application->HandleEvent($event, 'c:OnResetCMSMenuCache');
+
 			if ($refresh_permissions) {
 				if ($this->Application->ConfigValue('QuickCategoryPermissionRebuild')) {
 					// refresh permission without progress bar