Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r14851 -r14968
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 14851)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 14968)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 14851 2011-12-08 12:31:40Z alex $
+* @version	$Id: languages_event_handler.php 14968 2011-12-30 17:42:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -397,33 +397,27 @@
 		function OnChangeLanguage(&$event)
 		{
 			$language_id = $this->Application->GetVar('language');
+			$language_field = $this->Application->isAdmin ? 'AdminLanguage' : 'FrontLanguage';
 
-			if ($this->Application->isAdmin) {
-				// admin data only
-				$this->Application->SetVar('m_lang', $language_id);
+			$this->Application->SetVar('m_lang', $language_id);
 
-				// set new language for this session (admin interface only)
-				$this->Application->Session->SetField('Language', $language_id);
+			// set new language for this session
+			$this->Application->Session->SetField('Language', $language_id);
 
-				// remember last user language in administrative console
-				if ($this->Application->RecallVar('user_id') == USER_ROOT) {
-					$this->Application->StorePersistentVar('AdminLanguage', $language_id);
-				}
-				else {
-					$object =& $this->Application->recallObject('u.current');
-					/* @var $object kDBItem */
-
-					$object->SetDBField('AdminLanguage', $language_id);
-					$object->Update();
-				}
-
-				// without this language change in admin will cause erase of last remembered tree section
-				$this->Application->SetVar('skip_last_template', 1);
+			// remember last user language
+			if ($this->Application->RecallVar('user_id') == USER_ROOT) {
+				$this->Application->StorePersistentVar($language_field, $language_id);
 			}
 			else {
-				// changing language on Front-End
-				$this->Application->SetVar('m_lang', $language_id);
+				$object =& $this->Application->recallObject('u.current');
+				/* @var $object kDBItem */
+
+				$object->SetDBField($language_field, $language_id);
+				$object->Update();
 			}
+
+			// without this language change in admin will cause erase of last remembered tree section
+			$this->Application->SetVar('skip_last_template', 1);
 		}
 
 		/**