Index: branches/5.2.x/core/kernel/utility/formatters/options_formatter.php
===================================================================
diff -u -N -r14244 -r14628
--- branches/5.2.x/core/kernel/utility/formatters/options_formatter.php	(.../options_formatter.php)	(revision 14244)
+++ branches/5.2.x/core/kernel/utility/formatters/options_formatter.php	(.../options_formatter.php)	(revision 14628)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: options_formatter.php 14244 2011-03-16 20:53:41Z alex $
+* @version	$Id: options_formatter.php 14628 2011-10-04 09:36:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -14,6 +14,15 @@
 
 class kOptionsFormatter extends kFormatter {
 
+	/**
+	 * 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)
 	{
 		if ( is_null($value) ) {
@@ -70,20 +79,31 @@
 		}
 	}
 
-	function Parse($value, $field_name, &$object)
+	/**
+	 * Performs basic type validation on form field value
+	 *
+	 * @param mixed $value
+	 * @param string $field_name
+	 * @param kDBItem $object
+	 * @return mixed
+	 * @access public
+	 */
+	public function Parse($value, $field_name, &$object)
 	{
-		if ($value == '') return NULL;
+		if ( $value == '' ) {
+			return NULL;
+		}
 
+		$found = $option_key = false;
 		$options = $object->GetFieldOptions($field_name);
 		$use_phrases = getArrayValue($options, 'use_phrases');
 
-		$found = false;
 		foreach ($options['options'] as $option_key => $option_value) {
-			if ($use_phrases) {
+			if ( $use_phrases ) {
 				$option_value = $this->Application->Phrase($option_value);
 			}
 
-			if ($option_value == $value) {
+			if ( $option_value == $value ) {
 				$found = true;
 				break;
 			}