Index: branches/5.2.x/units/brackets/brackets_event_handler.php
===================================================================
diff -u -N -r14258 -r14625
--- branches/5.2.x/units/brackets/brackets_event_handler.php	(.../brackets_event_handler.php)	(revision 14258)
+++ branches/5.2.x/units/brackets/brackets_event_handler.php	(.../brackets_event_handler.php)	(revision 14625)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: brackets_event_handler.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: brackets_event_handler.php 14625 2011-10-04 09:34:12Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -30,25 +30,38 @@
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
-	function prepareObject(&$object, &$event)
+	/**
+	 * Apply some special processing to object being
+	 * recalled before using it in other events that
+	 * call prepareObject
+	 *
+	 * @param kDBItem|kDBList $object
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function prepareObject(&$object, &$event)
 	{
-		if($this->Application->GetVar('s_id') === false)
-		{
+		if ( $this->Application->GetVar('s_id') === false ) {
 			return;
 		}
 
 		$shipping_object =& $this->Application->recallObject('s');
+		/* @var $shipping_object kDBItem */
+
 		$lang_object =& $this->Application->recallObject('lang.current');
+		/* @var $lang_object LanguagesItem */
 
-		if($lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1)
-		{
-			$fields = Array('Start', 'End');
+		if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) {
+			$fields = Array ('Start', 'End');
+
 			$formatter =& $this->Application->recallObject('kUnitFormatter');
-			foreach($fields as $field)
-			{
+			/* @var $formatter kUnitFormatter */
+
+			foreach ($fields as $field) {
+				$object->SetFieldOption($field, 'formatter', 'kUnitFormatter');
 				$options = $object->GetFieldOptions($field);
-				$options['formatter'] = 'kUnitFormatter';
-				$object->SetFieldOptions($field, $options);
+
 				$formatter->prepareOptions($field, $options, $object);
 			}
 		}
@@ -156,17 +169,32 @@
 		$event->CallSubEvent('OnPreSaveBrackets');
 	}
 
-	function OnBeforeItemUpdate(&$event)
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(&$event)
 	{
+		parent::OnBeforeItemUpdate($event);
+
 		$shipping_object =& $this->Application->recallObject('s');
+		/* @var $shipping_object kDBItem */
+
 		$default_start = ($shipping_object->GetDBField('Type') == 1) ? 0 : 1;
 
 		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
 		$linked_info = $object->getLinkedInfo();
 		$object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']);
 
 		$brackets_helper =& $this->Application->recallObject('BracketsHelper');
-		$brackets_helper->InitHelper('Start', 'End', Array(), $default_start );
+		/* @var $brackets_helper kBracketsHelper */
+
+		$brackets_helper->InitHelper('Start', 'End', Array (), $default_start);
 		$brackets_helper->replaceInfinity($event);
 	}