Index: branches/RC/core/units/languages/import_xml.php =================================================================== diff -u -r8929 -r9398 --- branches/RC/core/units/languages/import_xml.php (.../import_xml.php) (revision 8929) +++ branches/RC/core/units/languages/import_xml.php (.../import_xml.php) (revision 9398) @@ -93,9 +93,9 @@ $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)); - + $sql = 'SELECT EventId, CONCAT(Event,"_",Type) AS EventMix FROM '.TABLE_PREFIX.'Events'; $this->events_hash = $this->Conn->GetCol($sql, 'EventMix'); @@ -198,7 +198,14 @@ if( !getArrayValue($this->current_language,'LanguageId') ) { $this->lang_object->SetDBField('Enabled', STATUS_ACTIVE); - if( $this->lang_object->Create() ) $this->current_language['LanguageId'] = $this->lang_object->GetID(); + + if ($this->lang_object->Create()) { + $this->current_language['LanguageId'] = $this->lang_object->GetID(); + if (defined('IS_INSTALL') && IS_INSTALL) { + // language created during install becomes admin interface language + $this->lang_object->setPrimary(true, true); + } + } } elseif($this->import_mode == LANG_OVERWRITE_EXISTING) { @@ -403,7 +410,7 @@ fclose($fp); return true; } - + /** * Creates new instance of LangXML_Parser class *