Index: branches/5.2.x/core/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -N -r14244 -r14585
--- branches/5.2.x/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 14244)
+++ branches/5.2.x/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 14585)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_tag_processor.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: custom_fields_tag_processor.php 14585 2011-09-24 12:04:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -112,15 +112,21 @@
 				$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')));
+					$field_name = 'cust_' . $list->GetDBField('FieldName');
+					
+					$formatter = $source_object->GetFieldOption($field_name, 'formatter');
+					$language_prefix = $formatter == 'kMultiLanguage' ? 'l' . $this->Application->GetVar('m_lang') . '_' : '';
+					
+					$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);
+					$list->SetDBField('DirectOptions', $source_object->GetFieldOption($field_name, 'options'));
 				}
 
 				$o.= $this->Application->ParseBlock($block_params);