Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r16016 -r16081
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 16016)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 16081)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 16016 2014-03-19 20:18:21Z alex $
+* @version	$Id: languages_event_handler.php 16081 2014-10-21 15:46:58Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -59,6 +59,23 @@
 		}
 
 		/**
+		 * Ensure, that current object is always taken from live table.
+		 *
+		 * @param kDBBase|kDBItem|kDBList $object Object.
+		 * @param kEvent                  $event  Event.
+		 *
+		 * @return void
+		 */
+		protected function dbBuild(&$object, kEvent $event)
+		{
+			if ( $event->Special == 'current' ) {
+				$event->setEventParam('live_table', true);
+			}
+
+			parent::dbBuild($object, $event);
+		}
+
+		/**
 		 * Allows to get primary language object
 		 *
 		 * @param kEvent $event
@@ -70,7 +87,17 @@
 			if ( $event->Special == 'primary' ) {
 				return $this->Application->GetDefaultLanguageId();
 			}
+			elseif ( $event->Special == 'current' ) {
+				$language_id = $this->Application->GetVar('m_lang');
 
+				if ( !$language_id ) {
+					$language_id = 'default';
+				}
+
+				$this->Application->SetVar('m_lang', $language_id);
+				$this->Application->SetVar($event->getPrefixSpecial() . '_id', $language_id);
+			}
+
 			return parent::getPassedID($event);
 		}