Index: branches/5.0.x/core/install/install_toolkit.php
===================================================================
diff -u -r12734 -r12899
--- branches/5.0.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12734)
+++ branches/5.0.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 12899)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: install_toolkit.php 12899 2009-11-11 20:59:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -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
@@ -789,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