Index: branches/5.0.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -r12400 -r12591
--- branches/5.0.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 12400)
+++ branches/5.0.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 12591)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: language_import_helper.php 12400 2009-09-01 19:17:59Z alex $
+* @version	$Id: language_import_helper.php 12591 2009-09-22 20:58:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -140,7 +140,7 @@
 
 			// copy data from temp tables to live
 			foreach ($this->_languages as $language_id) {
-				$this->_performUpgrade($language_id, 'phrases', 'Phrase');
+				$this->_performUpgrade($language_id, 'phrases', 'PhraseKey');
 				$this->_performUpgrade($language_id, 'emailmessages', 'EventId');
 			}
 
@@ -485,6 +485,7 @@
 				$fields_hash = Array (
 					'LanguageId' => $language_id,
 					'Phrase' => $phrase_node->Attributes['LABEL'],
+					'PhraseKey' => mb_strtoupper($phrase_node->Attributes['LABEL']),
 					'PhraseType' => $phrase_node->Attributes['TYPE'],
 					'Module' => array_key_exists('MODULE', $phrase_node->Attributes) ? $phrase_node->Attributes['MODULE'] : 'Core',
 					'LastChanged' => adodb_mktime(),
@@ -515,7 +516,7 @@
 		{
 			$email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
 			/* @var $email_message_helper EmailMessageHelper */
-			
+
 			do {
 				$event_id = $this->_getEventId($event_node->Attributes['EVENT'], $event_node->Attributes['TYPE']);
 				if ($event_id) {
@@ -534,7 +535,7 @@
 
 					$parsed = $email_message_helper->parseTemplate($fields_hash['Template']);
 					$fields_hash['Subject'] = $parsed['Subject'];
-					
+
 					$this->Conn->doInsert($fields_hash, $this->_tables['emailmessages'], 'INSERT', false);
 				}
 			} while (($event_node =& $event_node->NextSibling()));