Index: branches/5.1.x/core/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -N -r14241 -r14408
--- branches/5.1.x/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 14241)
+++ branches/5.1.x/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 14408)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_tag_processor.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: custom_fields_tag_processor.php 14408 2011-06-29 07:52:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -112,14 +112,25 @@
 				$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
 
 				if ($source_prefix) {
-					$list->SetDBField($params['value_field'], $source_object->GetDBField('cust_'.$list->GetDBField('FieldName')));
+					$options = $source_object->GetFieldOptions('cust_'.$list->GetDBField('FieldName'));
+
+					if ( isset($options['formatter']) && $options['formatter'] == 'kMultiLanguage' ) {
+						$language_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
+					}
+					else {
+						$language_prefix = '';
+					}
+
+					$list->SetDBField($params['value_field'], $source_object->GetDBField($language_prefix . 'cust_'.$list->GetDBField('FieldName')));
+
 					if ($display_original) {
 						$list->SetDBField('OriginalValue', $original_object->GetField('cust_'.$list->GetDBField('FieldName')));
 					}
+
 					$block_params['field'] = $block_params['virtual_field'] = 'cust_'.$list->GetDBField('FieldName');
 					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading') ) ? 1 : 0;
 
-					$options = $source_object->GetFieldOptions('cust_'.$list->GetDBField('FieldName'));
+
 					$list->SetDBField('DirectOptions', isset($options['options']) ? $options['options'] : false);
 				}