Index: branches/RC/core/units/languages/languages_event_handler.php
===================================================================
diff -u -r10577 -r10832
--- branches/RC/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 10577)
+++ branches/RC/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 10832)
@@ -232,28 +232,25 @@
 			}
 
 			$items_info = $this->Application->GetVar('phrases_import');
-			if($items_info)
-			{
-				list($id,$field_values) = each($items_info);
+			if ($items_info) {
+				list ($id, $field_values) = each($items_info);
 				$object =& $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true) );
 				$object->SetFieldsFromHash($field_values);
 
 				$filename = getArrayValue($field_values, 'LangFile', 'tmp_name');
-				if( filesize($filename) )
-				{
-					$modules = getArrayValue($field_values,'Module');
+				if ( filesize($filename) ) {
 					$lang_xml =& $this->Application->recallObject('LangXML');
 					/* @var $lang_xml LangXML_Parser */
-					$lang_xml->Parse($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite']);
 
-					$event->redirect = true;
-					$event->SetRedirectParams( Array('lang_event' => 'OnImportProgress', 'pass' => 'all,lang', 'mode'=>$field_values['ImportOverwrite']) );
+					$modules = getArrayValue($field_values, 'Module');
+					$lang_xml->Parse($filename, $field_values['PhraseType'], $modules, $field_values['ImportOverwrite'] ? LANG_OVERWRITE_EXISTING : LANG_SKIP_EXISTING);
+
+					$event->redirect = $this->Application->GetVar('next_template');
 				}
-				else
-				{
+				else {
 					$object =& $this->Application->recallObject('phrases.import');
 					$object->SetError('LangFile', 'la_empty_file', 'la_EmptyFile');
-					$event->redirect = false;
+					$event->status = erFAIL;
 				}
 			}
 		}