Index: trunk/admin/install.php
===================================================================
diff -u -r1923 -r1943
--- trunk/admin/install.php	(.../install.php)	(revision 1923)
+++ trunk/admin/install.php	(.../install.php)	(revision 1943)
@@ -696,7 +696,7 @@
 if($state=='languagepack_upgrade')
 {
 	$state = 'lang_install_init';
-	$_POST['lang'][] = 'english.lang';
+	if( is_object($application) ) $application->SetVar('lang', Array('english.lang') );
 	$force_finish = true;
 }
 
@@ -1347,11 +1347,9 @@
   		
   		$lang_xml->renameTable('phrases', TABLE_PREFIX.'ImportPhrases');
   		$lang_xml->renameTable('emailmessages', TABLE_PREFIX.'ImportEvents');
-  		
-	  	if(!$force_finish)
-	  	{
-	  		$lang_xml->lang_object->TableName = $application->getUnitOption('lang','TableName');
-	  	}
+	  	
+	  	$lang_xml->lang_object->TableName = $application->getUnitOption('lang','TableName');
+	  	
 		$languages = $application->GetVar('lang');
 		if($languages)
 		{
@@ -1366,7 +1364,8 @@
 				foreach($modules as $module_name => $module_folder)
 				{
 					$lang_path = DOC_ROOT.BASE_PATH.'/'.$module_folder.ADMIN_DIR.'/install/langpacks';
-					$lang_xml->Parse($lang_path.'/'.$lang_file, Array(0,1,2), '');	
+					$lang_xml->Parse($lang_path.'/'.$lang_file, Array(0,1,2), '');
+					if($force_finish) $lang_xml->lang_object->Update();
 				}
 			}