Index: trunk/core/units/languages/import_xml.php
===================================================================
diff -u -N -r6583 -r6685
--- trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 6583)
+++ trunk/core/units/languages/import_xml.php	(.../import_xml.php)	(revision 6685)
@@ -72,19 +72,25 @@
 
 		var $Encoding = 'base64';
 
-		function LangXML_Parser()
+		function LangXML_Parser($temp_mode = true)
 		{
 			parent::kBase();
 			$this->Conn =& $this->Application->GetADODBConnection();
 
-			$this->Application->SetVar('lang_mode', 't');
-
-			$this->tables['lang'] = $this->prepareTempTable('lang');
+			if ($temp_mode) {
+				$this->Application->SetVar('lang_mode', 't');
+				$this->tables['lang'] = $this->prepareTempTable('lang');
+				$this->tables['phrases'] = $this->prepareTempTable('phrases');
+				$this->tables['emailmessages'] = $this->prepareTempTable('emailmessages');
+			}
+			else {
+				$this->tables['lang'] = $this->Application->getUnitOption('lang', 'TableName');
+				$this->tables['phrases'] = $this->Application->getUnitOption('phrases', 'TableName');
+				$this->tables['emailmessages'] = $this->Application->getUnitOption('emailmessages', 'TableName');
+			}
+			
 			$this->lang_object =& $this->Application->recallObject('lang.imp', null, Array('skip_autoload' => true));
-
-			$this->tables['phrases'] = $this->prepareTempTable('phrases');
-			$this->tables['emailmessages'] = $this->prepareTempTable('emailmessages');
-
+			
 			$sql = 'SELECT EventId, CONCAT(Event,"_",Type) AS EventMix FROM '.TABLE_PREFIX.'Events';
 			$this->events_hash = $this->Conn->GetCol($sql, 'EventMix');
 
@@ -409,6 +415,18 @@
 			fclose($fp);
 			return true;
 		}
+		
+		/**
+		 * Creates new instance of LangXML_Parser class
+		 *
+		 * @param int $type
+		 * @return LangXML_Parser
+		 */
+		function &makeClass($temp_mode = true)
+		{
+			$result = new LangXML_Parser($temp_mode);
+			return $result;
+		}
 	}
 
 ?>
\ No newline at end of file