Index: trunk/admin/install.php
===================================================================
diff -u -r43 -r49
--- trunk/admin/install.php	(.../install.php)	(revision 43)
+++ trunk/admin/install.php	(.../install.php)	(revision 49)
@@ -14,6 +14,8 @@
 	$install_type = $_GET['install_type'];
 }
 
+$force_finish = isset($_REQUEST['ff']) ? true : false;
+
 $pathtoroot = "";
 if(!strlen($pathtoroot))
 {
@@ -530,10 +532,17 @@
     			}
     		}
     	}
-    }
 	
-	$state = "finish";
-	$include_file = "install/install_finish.php";
+	$state = 'languagepack_upgrade';
+    }
+}	
+
+// upgrade language pack
+if($state=='languagepack_upgrade')
+{
+	$state = 'lang_install_init';
+	$_POST['lang'][] = 'english.lang';
+	$force_finish = true;
 }
 
 if($state=="db_reconfig_save")
@@ -1289,7 +1298,7 @@
   
   if($Status==0)
   { 
-    	$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2",TRUE,200,$Offset);
+    	$Offset = $objLanguages->ReadImportTable($PhraseTable, 1,"0,1,2", $force_finish ? false : true, 200,$Offset);
   		if($Offset>=$Total)
   		{    	
     		$Offset=0;
@@ -1303,7 +1312,9 @@
     		$next_step = $_GET['next_step'];
     	}
     	
+		if($force_finish == true) $next_step = 3;
 		$NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&state=lang_install&next_step=$next_step&install_type=$install_type";
+		if($force_finish == true) $NextUrl .= '&ff=1';
 		$include_file = "install/lang_run.php";
   }
   else 
@@ -1312,7 +1323,7 @@
   	    $objMessageList = new clsEmailMessageList();
   	    
   	    
-  	  $Offset = $objMessageList->ReadImportTable($EventTable,TRUE,100,$Offset);
+  	  $Offset = $objMessageList->ReadImportTable($EventTable, $force_finish ? false : true,100,$Offset);
   	  
   	  if($Offset>$Total)
   	  {
@@ -1322,14 +1333,30 @@
     	else if ($_GET['next_step']) {
     		$next_step = $_GET['next_step'];
     	}  	  	
+    	if($force_finish == true) $next_step = 3;
   	  	$NextUrl = $_SERVER['PHP_SELF']."?Offset=$Offset&Status=$Status&State=lang_install&next_step=$next_step&install_type=$install_type";
+  	  	if($force_finish == true) $NextUrl .= '&ff=1';
   	  	$include_file = "install/lang_run.php";
   	  }
   	  else
-  	    $state="lang_default";
+  	  {
+  	    if( !$force_finish )
+  	    {
+  	    	$state = 'lang_default';
+  	    }
+  	    else
+  		{
+  	    	$_POST['next_step'] = 4;
+  	    	$state = 'finish';
+			$include_file = "install/install_finish.php";
+  		}
+  	  }
   }
 }
 
+
+
+
 if($state=="lang_default_set")
 {
 //	phpinfo(INFO_VARIABLES);
@@ -1823,7 +1850,8 @@
 							<ol class="install">
 					    		<li <?php if ($tmp_step == 1 || $login_error != '' || $inst_error != '') { ?>class="current"<?php } ?>>License Verification
 					    		<li <?php if ($tmp_step == 2 && $login_error == '' && $inst_error == '') { ?>class="current"<?php } ?>>Select Modules to Upgrade
-					    		<li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Finish
+					    		<li <?php if ($tmp_step == 3) { ?>class="current"<?php } ?>>Language Pack Upgrade
+					    		<li <?php if ($tmp_step == 4) { ?>class="current"<?php } ?>>Finish
 					    	</ol>				    				    
 					    <?php } ?>						    			    
 						<?php include($include_file); ?>