Index: branches/5.0.x/core/units/languages/languages_tag_processor.php
===================================================================
diff -u -N -r12734 -r12970
--- branches/5.0.x/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 12734)
+++ branches/5.0.x/core/units/languages/languages_tag_processor.php	(.../languages_tag_processor.php)	(revision 12970)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_tag_processor.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: languages_tag_processor.php 12970 2009-12-22 11:02:37Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -84,7 +84,14 @@
 		function SelectedLanguage($params)
 		{
 			$object =& $this->getObject($params);
-			return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
+			/* @var $object kDBList */
+
+			if (array_key_exists('type', $params) && $params['type'] == 'data') {
+				// when using language selector on editing forms
+				return $object->GetDBField('LanguageId') == $this->Application->GetVar('m_lang');
+			}
+
+			return $object->GetDBField('LanguageId') == $this->Application->Phrases->LanguageId;
 		}
 
 		/**