Index: branches/5.2.x/core/units/helpers/brackets_helper.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/helpers/brackets_helper.php	(.../brackets_helper.php)	(revision 13840)
+++ branches/5.2.x/core/units/helpers/brackets_helper.php	(.../brackets_helper.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: brackets_helper.php 13750 2010-06-09 20:01:41Z alex $
+* @version	$Id: brackets_helper.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,9 +60,9 @@
 		 */
 		var $_language = null;
 
-		function kBracketsHelper()
+		public function __construct()
 		{
-			parent::kHelper();
+			parent::__construct();
 
 			$this->_language =& $this->Application->recallObject('lang.current');
 			/* @var $lang kDBItem */
@@ -196,7 +196,7 @@
 				$field_values[$i][$object->IDField] = $i;
 				$field_values[$i][$this->min_field] = ($i == $new_id-4 && $last_max_qty != -1) ? $last_max_qty : '';
 				$field_values[$i][$this->max_field] = ($i == $new_id-4 && $last_max_qty != -1) ? -1 : '';
-				$field_values[$i] = array_merge_recursive2($field_values[$i], $this->default_values);
+				$field_values[$i] = array_merge($field_values[$i], $this->default_values);
 			}
 
 			$event->CallSubEvent('OnPreSaveBrackets');
@@ -238,7 +238,7 @@
 				$infinite_bracket[$object->IDField] = $new_id;
 				$infinite_bracket[$this->min_field] = ($brackets_exist > 0) ? $last_bracket[$this->max_field] : $this->defaultStartValue;
 				$infinite_bracket[$this->max_field] = '-1';
-				$infinite_bracket = array_merge_recursive2($infinite_bracket, $this->default_values);
+				$infinite_bracket = array_merge($infinite_bracket, $this->default_values);
 
 				$field_values[$new_id] = $infinite_bracket;
 				reset($field_values);
@@ -257,6 +257,7 @@
 			$items_info = $this->getBrackets($event);
 			if ($items_info) {
 				$object =& $event->getObject();
+				/* @var $object kDBItem */
 
 				$linked_info = $object->getLinkedInfo();
 				$stored_ids = $this->Conn->GetCol('SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE '.$linked_info['ForeignKey'].' = '.$linked_info['ParentId']);
@@ -266,7 +267,6 @@
 				foreach ($items_info as $item_id => $values) {
 
 					if (in_array($item_id, $stored_ids)) { //if it's already exist
-						$object->SetDefaultValues();
 						$object->Load($item_id);
 						$object->SetFieldsFromHash($values);
 						if (!$object->Validate()) {
@@ -276,23 +276,23 @@
 						}
 						if( $object->Update($item_id) )
 						{
-							$event->status = erSUCCESS;
+							$event->status = kEvent::erSUCCESS;
 						}
 						else
 						{
-							$event->status = erFAIL;
+							$event->status = kEvent::erFAIL;
 							$event->redirect = false;
 							break;
 						}
 						unset( $stored_ids[ array_search($item_id, $stored_ids) ] );
 					}
 					else {
-						$object->SetDefaultValues();
+						$object->Clear();
 						$object->SetFieldsFromHash($values);
 						$object->SetDBField($linked_info['ForeignKey'], $linked_info['ParentId']);
 
 						if ($object->Create()) {
-							$event->status = erSUCCESS;
+							$event->status = kEvent::erSUCCESS;
 						}
 					}
 				}