Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r15780 -r16015
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 15780)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 16015)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 15780 2013-05-25 12:51:15Z alex $
+* @version	$Id: product_option_combinations_event_handler.php 16015 2014-03-19 20:18:11Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -74,7 +74,7 @@
 		return explode(',', $this->Conn->GetOne($query));
 	}
 
-	function CreateCombinations($event, $fields, $current_option=null)
+	function CreateCombinations(kEvent $event, $fields, $current_option=null)
 	{
 		$recursed = false;
 		$combination = $fields['Combination'];
@@ -99,6 +99,8 @@
 			ksort($salt);
 			$object->Load(kUtil::crc32(serialize($salt)), 'CombinationCRC');
 			$object->SetFieldsFromHash($fields);
+			$event->setEventParam('form_data', $fields);
+
 			$this->customProcessing($event,'before');
 			if ( $object->isLoaded() ) { // Update if such combination already exists
 				if( $object->Update() )
@@ -117,7 +119,7 @@
 		}
 	}
 
-	function UpdateCombinations($event, $fields, $current_option=null)
+	function UpdateCombinations(kEvent $event, $fields, $current_option=null)
 	{
 		$recursed = false;
 		$combination = $fields['Combination'];
@@ -147,6 +149,7 @@
 				$object->Load($edit_id);
 			}
 			$object->SetFieldsFromHash($fields);
+			$event->setEventParam('form_data', $fields);
 
 			$this->customProcessing($event,'before');
 			if( $object->Update() )
@@ -176,14 +179,14 @@
 		}
 
 		list($id, $field_values) = each($items_info);
-		$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
+		$object->setID($id);
+		$object->SetFieldsFromHash($field_values);
 		$event->setEventParam('form_data', $field_values);
 
 		if ( !$object->Validate() ) {
 			$event->status = kEvent::erFAIL;
 			$event->redirect = false;
 			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
-			$object->setID($id);
 			return;
 		}
 
@@ -208,7 +211,7 @@
 			foreach($items_info as $id => $field_values)
 			{
 				$object->Load($id);
- 				$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
+ 				$object->SetFieldsFromHash($field_values);
 				$event->setEventParam('form_data', $field_values);
 
  				if (!$object->Validate()) {
@@ -395,7 +398,7 @@
 			$temp_object->SwitchToTemp();
 			$temp_object->Load($id);
 
-			$temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), null, Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
+			$temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
 			$temp_object->Update();
 		}
 	}
@@ -442,4 +445,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+}