Index: branches/5.2.x/core/kernel/utility/formatters/customfield_formatter.php
===================================================================
diff -u -N -r14628 -r14748
--- branches/5.2.x/core/kernel/utility/formatters/customfield_formatter.php	(.../customfield_formatter.php)	(revision 14628)
+++ branches/5.2.x/core/kernel/utility/formatters/customfield_formatter.php	(.../customfield_formatter.php)	(revision 14748)
@@ -1,8 +1,8 @@
 <?php
 /**
-* @version	$Id: customfield_formatter.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: customfield_formatter.php 14748 2011-11-09 09:35:48Z alex $
 * @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
+* @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
 * In-Portal is Open Source software.
 * This means that this software may have been modified pursuant
@@ -12,40 +12,42 @@
 * See http://www.in-portal.org/license for copyright notices and details.
 */
 
+defined('FULL_PATH') or die('restricted access!');
+
+/**
+ * Like kMultiLanguage formatter for LEFT JOINed custom fields
+ *
+ */
+class kCustomFieldFormatter extends kFormatter
+{
+
 	/**
-	 * Like kMultiLanguage formatter for LEFT JOINed custom fields
+	 * Formats value of a given field
 	 *
+	 * @param string $value
+	 * @param string $field_name
+	 * @param kDBItem|kDBList $object
+	 * @param string $format
+	 * @return string
 	 */
-	class kCustomFieldFormatter extends kFormatter
+	function Format($value, $field_name, &$object, $format=null)
 	{
+		$options = $object->GetFieldOptions($field_name);
 
-		/**
-		 * Formats value of a given field
-		 *
-		 * @param string $value
-		 * @param string $field_name
-		 * @param kDBItem|kDBList $object
-		 * @param string $format
-		 * @return string
-		 */
-		function Format($value, $field_name, &$object, $format=null)
-		{
-			$options = $object->GetFieldOptions($field_name);
+		$master_field = isset($options['master_field']) ? $options['master_field'] : false;
+		if (!$master_field) {
+			return $value;
+		}
 
-			$master_field = isset($options['master_field']) ? $options['master_field'] : false;
-			if (!$master_field) {
-				return $value;
-			}
+		$format = isset($format) ? $format : ( isset($options['format']) ? $options['format'] : null);
 
-			$format = isset($format) ? $format : ( isset($options['format']) ? $options['format'] : null);
-
-			if ($value == '' && $format != 'no_default') { // try to get default language value
-				$def_lang_value = $object->GetDBField($master_field);
-				if ($def_lang_value == '') return NULL;
-				return $def_lang_value; //return value from default language
-			}
-
-			return $value;
+		if ($value == '' && $format != 'no_default') { // try to get default language value
+			$def_lang_value = $object->GetDBField($master_field);
+			if ($def_lang_value == '') return NULL;
+			return $def_lang_value; //return value from default language
 		}
 
-	}
\ No newline at end of file
+		return $value;
+	}
+
+}
\ No newline at end of file