Index: branches/5.2.x/core/install/upgrades.php
===================================================================
diff -u -N -r15001 -r15012
--- branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 15001)
+++ branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 15012)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15001 2012-01-06 16:36:38Z alex $
+* @version	$Id: upgrades.php 15012 2012-01-06 20:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1797,7 +1797,7 @@
 		function transformSortings()
 		{
 			$sql = 'SELECT VariableName, PortalUserId
-					FROM ' . TABLE_PREFIX . 'PersistantSessionData
+					FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 					WHERE VariableName LIKE "%_Sort1.%"';
 			$sortings = $this->Conn->Query($sql);
 
@@ -1817,7 +1817,7 @@
 				$old_variable_names = $this->Conn->qstrArray($old_variable_names);
 
 				$sql = 'SELECT VariableValue, VariableName
-						FROM ' . TABLE_PREFIX . 'PersistantSessionData
+						FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 						WHERE PortalUserId = ' . $user_id . ' AND VariableName IN (' . implode(',', $old_variable_names) . ')';
 				$sorting_data = $this->Conn->GetCol($sql, 'VariableName');
 
@@ -1838,10 +1838,10 @@
 					'VariableValue' => serialize($new_sorting),
 				);
 
-				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'PersistantSessionData');
+				$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserPersistentSessionData');
 
 				// delete sortings, that were already processed
-				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'PersistantSessionData
+				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserPersistentSessionData
 						WHERE PortalUserId = ' . $user_id . ' AND VariableName IN (' . implode(',', $old_variable_names) . ')';
 				$this->Conn->Query($sql);
 			}
@@ -1867,6 +1867,7 @@
 			$delete_ids = Array ();
 			$ml_helper->createFields('phrases');
 			$languages = $ml_helper->getLanguages();
+			$phrase_table = $this->Application->getUnitOption('phrases', 'TableName');
 
 			foreach ($source_phrases as $phrase_key => $phrase_info) {
 				$target_phrase_key = $target_prefix . substr($phrase_key, strlen($source_prefix));
@@ -1883,12 +1884,12 @@
 				}
 
 				$delete_ids[] = $phrase_info['PhraseId'];
-				$this->Conn->doUpdate($fields_hash, TABLE_PREFIX . 'Phrase', 'PhraseId = ' . $target_phrases[$target_phrase_key]['PhraseId']);
+				$this->Conn->doUpdate($fields_hash, $phrase_table, 'PhraseId = ' . $target_phrases[$target_phrase_key]['PhraseId']);
 			}
 
 			// delete all column phrases, that were absorbed by field phrases
 			if ( $delete_ids ) {
-				$sql = 'DELETE FROM ' . TABLE_PREFIX . 'Phrase
+				$sql = 'DELETE FROM ' . $phrase_table . '
 						WHERE PhraseId IN (' . implode(',', $delete_ids) . ')';
 				$this->Conn->Query($sql);
 
@@ -1907,7 +1908,7 @@
 		protected function getPhrasesByMask($mask)
 		{
 			$sql = 'SELECT *
-					FROM ' . TABLE_PREFIX . 'Phrase
+					FROM ' . $this->Application->getUnitOption('phrases', 'TableName') . '
 					WHERE PhraseKey LIKE ' . $this->Conn->qstr($mask);
 
 			return $this->Conn->Query($sql, 'PhraseKey');