Index: branches/5.1.x/core/kernel/kbase.php
===================================================================
diff -u -N -r13168 -r13470
--- branches/5.1.x/core/kernel/kbase.php	(.../kbase.php)	(revision 13168)
+++ branches/5.1.x/core/kernel/kbase.php	(.../kbase.php)	(revision 13470)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: kbase.php 13168 2010-02-24 17:26:57Z alex $
+* @version	$Id: kbase.php 13470 2010-04-28 15:21:51Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -632,11 +632,14 @@
 	 */
 	function _replaceLanguageId($field_name, $field_option_names)
 	{
-		$language_id = $this->Application->GetVar('m_lang');
+		// don't use GetVar('m_lang') since it's always equals to default language on editing form in admin
+		$current_language_id = $this->Application->Phrases->LanguageId;
+		$primary_language_id = $this->Application->GetDefaultLanguageId();
 
 		$field_options =& $this->Fields[$field_name];
 		foreach ($field_option_names as $option_name) {
-			$field_options[$option_name] = str_replace('%2$s', $language_id, $field_options[$option_name]);
+			$field_options[$option_name] = str_replace('%2$s', $current_language_id, $field_options[$option_name]);
+			$field_options[$option_name] = str_replace('%3$s', $primary_language_id, $field_options[$option_name]);
 		}
 	}