Index: branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php
===================================================================
diff -u -r6239 -r6264
--- branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php	(.../application.php)	(revision 6239)
+++ branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php	(.../application.php)	(revision 6264)
@@ -2119,7 +2119,7 @@
 	 */
 	function isModuleEnabled($module_name)
 	{
-		return $this->findModule('Name', $module_name);
+		return $this->findModule('Name', $module_name) !== false;
 
 	}
 
Index: branches/unlabeled/unlabeled-1.41.2/kernel/admin_templates/incs/script.js
===================================================================
diff -u -r5495 -r6264
--- branches/unlabeled/unlabeled-1.41.2/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 5495)
+++ branches/unlabeled/unlabeled-1.41.2/kernel/admin_templates/incs/script.js	(.../script.js)	(revision 6264)
@@ -310,13 +310,13 @@
 function openSelector($prefix, $url, $dst_field, $window_size, $event)
 {
 	var $kf = document.getElementById($form_name);
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(m[^:]+)');
+	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(m[^:]+)');
 	$regex = $regex.exec($url);
-	
-	var $t = $regex[2];
+
+	var $t = $regex[3];
 	var $window_name = 'select_'+$t.replace(/(\/|-)/g, '_');
-	set_hidden_field('return_m', $regex[3]);
-	
+	set_hidden_field('return_m', $regex[4]);
+
 	if (!isset($window_size)) $window_size = '750x400';
 
 	$window_size = $window_size.split('x');
@@ -335,7 +335,7 @@
 	openwin('', $window_name, $window_size[0], $window_size[1]);
 	$kf.action = $url;
 	$kf.target = $window_name;
-	
+
 	submit_event($prefix, $event, $t);
 
 	processHooks('openSelector', hAFTER);
@@ -347,33 +347,33 @@
 {
 	var $kf = document.getElementById($form_name);
 	var $window_name = 'select_'+t.replace(/(\/|-)/g, '_');
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(m[^:]+)');
-	
+	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(m[^:]+)');
+
 	$regex = $regex.exec($kf.action);
-	set_hidden_field('return_m', $regex[3]);
+	set_hidden_field('return_m', $regex[4]);
 	var $prev_opener = get_hidden_field('m_opener');
 	if (!isset(multi_line)) multi_line = 0;
 	openwin('', $window_name, 750, 400);
 	set_hidden_field('return_template', $kf.elements['t'].value); // where should return after popup is done
 	set_hidden_field('m_opener', 'p');
-	
+
 	set_hidden_field('translator_wnd_name', $window_name);
 	set_hidden_field('translator_field', field);
 	set_hidden_field('translator_t', t);
 	set_hidden_field('translator_prefixes', prefix);
 	set_hidden_field('translator_multi_line', multi_line);
 	$kf.target = $window_name;
-	
+
 	return $prev_opener;
 }
 
 function PreSaveAndOpenTranslator(prefix, field, t, multi_line)
 {
 	var $prev_opener = InitTranslator(prefix, field, t, multi_line);
-	
+
 	var split_prefix = prefix.split(',');
 	submit_event(split_prefix[0], 'OnPreSaveAndOpenTranslator');
-	
+
 	set_hidden_field('m_opener', $prev_opener);
 }
 
@@ -385,7 +385,7 @@
 
 	var split_prefix = prefix.split(',');
 	submit_event(split_prefix[0],'OnPreSaveAndOpenTranslator');
-	
+
 	set_hidden_field('m_opener', $prev_opener);
 }
 
@@ -397,8 +397,8 @@
 	set_hidden_field('trans_field', field);
 	set_hidden_field('events[trans]', 'OnLoad');
 
-	var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(.*)');
-	var $t = $regex.exec(url)[2];
+	var $regex = new RegExp('(.*)\?env=(' + document.getElementById('sid').value + ')?-(.*?):(.*)');
+	var $t = $regex.exec(url)[3];
 	$kf.target = wnd;
 	submit_event(prefix,'',$t,url);
 }
@@ -1019,7 +1019,7 @@
 		$dst_element.appendChild($new_element);
 		return $new_element;
 	}
-	
+
 	Math.sum = function($array) {
 		var $i = 0;
 		var $total = 0;
@@ -1029,7 +1029,7 @@
 		}
 		return $total;
 	}
-	
+
 	Math.average = function($array) {
 		return Math.sum($array) / $array.length;
 	}
Index: branches/unlabeled/unlabeled-1.44.2/admin/install/install_lib.php
===================================================================
diff -u -r6237 -r6264
--- branches/unlabeled/unlabeled-1.44.2/admin/install/install_lib.php	(.../install_lib.php)	(revision 6237)
+++ branches/unlabeled/unlabeled-1.44.2/admin/install/install_lib.php	(.../install_lib.php)	(revision 6264)
@@ -925,7 +925,7 @@
 		$lang_path = FULL_PATH.'/'.$module_name.'/admin/install/langpacks';
 		$lang_xml->Parse($lang_path.'/english.lang', '|0|1|2|', '');
 
-		$app->Redirect('modules/modules_list', Array('pass' => 'all', 'admin' => 1, 'Refresh' => 1), 'admin');
+		$app->Redirect('modules/modules_list', Array('pass' => 'all', 'admin' => 1, 'RefreshTree' => 1), '', 'index.php');
 	}
 
 	/**
Index: branches/unlabeled/unlabeled-1.107.2/admin/install.php
===================================================================
diff -u -r6238 -r6264
--- branches/unlabeled/unlabeled-1.107.2/admin/install.php	(.../install.php)	(revision 6238)
+++ branches/unlabeled/unlabeled-1.107.2/admin/install.php	(.../install.php)	(revision 6264)
@@ -1385,10 +1385,10 @@
 if($state=="lang_install_init")
 {
 
-  	$ado =& inst_GetADODBConnection();
+	$ado =& inst_GetADODBConnection();
 
-  	if( TableExists($ado, 'Language,Phrase') )
-  	{
+	if( TableExists($ado, 'Language,Phrase') )
+	{
 		// KERNEL 4 INIT: BEGIN
 		define('FULL_PATH', realpath(dirname(__FILE__).'/..'));
 		define('APPLICATION_CLASS', 'MyApplication');
@@ -1398,12 +1398,18 @@
 		$application->Init();
 		// KERNEL 4 INIT: END
 
-  		$lang_xml =& $application->recallObject('LangXML');
+		$lang_xml =& $application->recallObject('LangXML');
 
-  		$lang_xml->renameTable('phrases', TABLE_PREFIX.'ImportPhrases');
-  		$lang_xml->renameTable('emailmessages', TABLE_PREFIX.'ImportEvents');
+		if (defined('DBG_FAST_INSTALL') && DBG_FAST_INSTALL) {
+			$lang_xml->tables['phrases'] = TABLE_PREFIX.'Phrase';
+			$lang_xml->tables['emailmessages'] = TABLE_PREFIX.'EmailMessage';
+		}
+		else {
+			$lang_xml->renameTable('phrases', TABLE_PREFIX.'ImportPhrases');
+			$lang_xml->renameTable('emailmessages', TABLE_PREFIX.'ImportEvents');
+		}
 
-	  	$lang_xml->lang_object->TableName = $application->getUnitOption('lang','TableName');
+		$lang_xml->lang_object->TableName = $application->getUnitOption('lang','TableName');
 
 		$languages = $application->GetVar('lang');
 		if($languages)
@@ -1424,19 +1430,24 @@
 				}
 			}
 
-	      	$state = 'lang_install';
-	  	}
-	  	else
-	  	{
-	  		$state = 'lang_select';
-	  	}
+			if (defined('DBG_FAST_INSTALL') && DBG_FAST_INSTALL) {
+				$state = 'lang_default';
+			}
+			else {
+				$state = 'lang_install';
+			}
+		}
+		else
+		{
+			$state = 'lang_select';
+		}
 
-	  	$application->Done();
-  	}
-  	else
-  	{
-  		$general_error = 'Database error! No language tables found!';
-  	}
+		$application->Done();
+	}
+	else
+	{
+		$general_error = 'Database error! No language tables found!';
+	}
 }
 
 if($state=="lang_install")
@@ -1516,7 +1527,12 @@
 	$Id = $_POST["lang"];
 
 	$objLanguages->SetPrimary($Id);
-	$state="postconfig_1";
+	if (defined('DBG_FAST_INSTALL')) {
+		$state = 'theme_sel';
+	}
+	else {
+		$state="postconfig_1";
+	}
 }
 
 if($state=="lang_default")
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt
===================================================================
diff -u -r6257 -r6264
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt	(.../changelog_1_3_0.txt)	(revision 6257)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_3_0.txt	(.../changelog_1_3_0.txt)	(revision 6264)
@@ -22,7 +22,9 @@
 File in-portal/admin/category/js/lang.js is removed; release_1_2_1 revision 1.1
 File in-portal/admin/category/js/main.js is removed; release_1_2_1 revision 1.1
 File in-portal/admin/install/inportal_data.sql changed
+File in-portal/admin/install/inportal_remove.sql changed
 File in-portal/admin/install/install_lib.php changed
+File in-portal/admin/install/upgrades/changelog_1_3_0.txt is new; release_1_3_0 revision 1.1.2.1
 File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.0.sql is new; release_1_3_0 revision 1.1.2.1
 File in-portal/kernel/admin/advanced_view.php is removed; release_1_2_1 revision 1.4
 File in-portal/kernel/admin/include/toolbar/advanced_view.php is removed; release_1_2_1 revision 1.11.2.1
@@ -33,6 +35,7 @@
 File in-portal/kernel/admin/include/toolbar/editgroup_permissions.php is removed; release_1_2_1 revision 1.1
 File in-portal/kernel/admin/include/toolbar/editgroup_users.php is removed; release_1_2_1 revision 1.1
 File in-portal/kernel/admin_templates/incs/config_blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/script.js changed
 File in-portal/kernel/admin_templates/regional/phrases_edit.tpl changed
 File in-portal/kernel/admin_templates/tools/system_tools.tpl changed
 File in-portal/kernel/include/image.php changed
Index: branches/unlabeled/unlabeled-1.11.2/admin/install/inportal_remove.sql
===================================================================
diff -u -r5303 -r6264
--- branches/unlabeled/unlabeled-1.11.2/admin/install/inportal_remove.sql	(.../inportal_remove.sql)	(revision 5303)
+++ branches/unlabeled/unlabeled-1.11.2/admin/install/inportal_remove.sql	(.../inportal_remove.sql)	(revision 6264)
@@ -207,4 +207,10 @@
 DROP TABLE TopicCustomData
 # --------------------------------------------------------
 DROP TABLE ImportCache
+# --------------------------------------------------------
+DROP TABLE FormFields
+# --------------------------------------------------------
+DROP TABLE Forms
+# --------------------------------------------------------
+DROP TABLE FormSubmissions
 #
\ No newline at end of file