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")