Index: branches/5.1.x/core/kernel/utility/formatters/multilang_formatter.php
===================================================================
diff -u -N -r13144 -r13168
--- branches/5.1.x/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 13144)
+++ branches/5.1.x/core/kernel/utility/formatters/multilang_formatter.php	(.../multilang_formatter.php)	(revision 13168)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: multilang_formatter.php 13144 2010-01-30 16:14:42Z alex $
+* @version	$Id: multilang_formatter.php 13168 2010-02-24 17:26:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -24,13 +24,23 @@
 	 */
 	function LangFieldName($field_name, $from_primary = false)
 	{
-		if (preg_match('/^l[0-9]+_/', $field_name)) return $field_name;
-		$lang = $from_primary ? $this->Application->GetDefaultLanguageId() : $this->Application->GetVar('m_lang');
+		static $primary_language = null;
+
+		if (preg_match('/^l[0-9]+_/', $field_name)) {
+			return $field_name;
+		}
+
+		if (!isset($primary_language)) {
+			$primary_language = $this->Application->GetDefaultLanguageId();
+		}
+
+		$lang = $from_primary ? $primary_language : $this->Application->GetVar('m_lang');
+
 		if (!$lang || ($lang == 'default')) {
-			$lang = $this->Application->GetDefaultLanguageId();
+			$lang = $primary_language;
 		}
 
-		return 'l'.$lang.'_'.$field_name;
+		return 'l' . $lang . '_' . $field_name;
 	}
 
 	function PrepareOptions($field_name, &$field_options, &$object)