Index: branches/5.2.x/core/units/custom_fields/custom_fields_tag_processor.php
===================================================================
diff -u -N -r14585 -r14628
--- branches/5.2.x/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 14585)
+++ branches/5.2.x/core/units/custom_fields/custom_fields_tag_processor.php	(.../custom_fields_tag_processor.php)	(revision 14628)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_tag_processor.php 14585 2011-09-24 12:04:17Z alex $
+* @version	$Id: custom_fields_tag_processor.php 14628 2011-10-04 09:36:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -86,56 +86,60 @@
 			$prev_heading = '';
 			$display_original = false;
 			$source_prefix = getArrayValue($params, 'SourcePrefix');
-			if ($source_prefix) {
+			$source_object = $original_object = null;
+
+			if ( $source_prefix ) {
 				$source_object =& $this->Application->recallObject($source_prefix, null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
 				/* @var $source_object kCatDBItem */
 
-				$display_original = $this->Application->ProcessParsedTag($source_prefix, 'DisplayOriginal', Array('display_original' => $this->setParamValue($params, 'display_original')));
+				$display_original = $this->Application->ProcessParsedTag($source_prefix, 'DisplayOriginal', Array ('display_original' => $this->setParamValue($params, 'display_original')));
 			}
 
-			if ($display_original) {
+			if ( $display_original ) {
 				$block_params['display_original'] = $display_original;
 				$block_params['original_title'] = $this->setParamValue($params, 'original_title');
-				$original_object =& $this->Application->recallObject($source_prefix.'.original', null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
+
+				$original_object =& $this->Application->recallObject($source_prefix . '.original', null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
+				/* @var $original_object kCatDBItem */
 			}
 
 			if ($this->Special == 'general') {
 				$list->groupRecords('Heading');
 			}
 
 			$i = 0;
-			while (!$list->EOL())
-			{
+			while ( !$list->EOL() ) {
 				$block_params['is_last'] = ($i == $list->GetSelectedCount() - 1);
 				$block_params['not_last'] = !$block_params['is_last']; // for front-end
 
-				$this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET
+				$this->Application->SetVar($this->getPrefixSpecial() . '_id', $list->GetDBField($id_field)); // for edit/delete links using GET
 
-				if ($source_prefix) {
+				if ( $source_prefix ) {
 					$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')));
+					$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;
+					$block_params['field'] = $block_params['virtual_field'] = 'cust_' . $list->GetDBField('FieldName');
+					$block_params['show_heading'] = ($prev_heading != $list->GetDBField('Heading')) ? 1 : 0;
 
 					$list->SetDBField('DirectOptions', $source_object->GetFieldOption($field_name, 'options'));
 				}
 
-				$o.= $this->Application->ParseBlock($block_params);
+				$o .= $this->Application->ParseBlock($block_params);
 				$prev_heading = $list->GetDBField('Heading');
 				$list->GoNext();
 				$i++;
 			}
 
-			$this->Application->SetVar( $this->getPrefixSpecial().'_id', '');
+			$this->Application->SetVar($this->getPrefixSpecial() . '_id', '');
+
 			return $o;
 		}