Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r15145 -r15222
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 15145)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 15222)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: languages_event_handler.php 15222 2012-03-15 16:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -340,7 +340,8 @@
 				$sql = 'UPDATE ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
 						SET
 							l' . $dst_language . '_Subject = l' . $src_language . '_Subject,
-							l' . $dst_language . '_Body = l' . $src_language . '_Body';
+							l' . $dst_language . '_HtmlBody = l' . $src_language . '_HtmlBody,
+							l' . $dst_language . '_PlainTextBody = l' . $src_language . '_PlainTextBody';
 				$this->Conn->Query($sql);
 			}
 
@@ -549,15 +550,26 @@
 					$language_import_helper->setExportEncoding('plain');
 				}
 
+				$data_types = Array (
+					'phrases' => 'ExportPhrases',
+					'emailevents' => 'ExportEmailEvents',
+					'country-state' => 'ExportCountries'
+				);
+
 				$export_mode = $this->Application->GetVar('export_mode');
+				$allowed_data_types = explode('|', substr($field_values['ExportDataTypes'], 1, -1));
 
 				if ( $export_mode == $event->Prefix ) {
-					$language_import_helper->setExportLimit('phrases', $field_values['ExportPhrases']);
-					$language_import_helper->setExportLimit('emailevents', $field_values['ExportEmailEvents']);
+					foreach ($data_types as $prefix => $export_limit_field) {
+						$export_limit = in_array($prefix, $allowed_data_types) ? $field_values[$export_limit_field] : '-';
+						$language_import_helper->setExportLimit($prefix, $export_limit);
+					}
 				}
 				else {
-					$language_import_helper->setExportLimit($export_mode);
-					$language_import_helper->setExportLimit($export_mode == 'phrases' ? 'emailevents' : 'phrases', '-');
+					foreach ($data_types as $prefix => $export_limit_field) {
+						$export_limit = in_array($prefix, $allowed_data_types) ? null : '-';
+						$language_import_helper->setExportLimit($prefix, $export_limit);
+					}
 				}
 
 				$lang_ids = explode(',', $this->Application->RecallVar('export_language_ids'));
@@ -621,7 +633,8 @@
 			// clean EmailEvents table
 			$fields_hash = Array (
 				'l' . $object->GetID() . '_Subject' => NULL,
-				'l' . $object->GetID() . '_Body' => NULL,
+				'l' . $object->GetID() . '_HtmlBody' => NULL,
+				'l' . $object->GetID() . '_PlainTextBody' => NULL,
 			);
 			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('emailevents', 'TableName'), 1);