Index: branches/5.2.x/units/coupons/coupons_event_handler.php =================================================================== diff -u -r14986 -r15047 --- branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 14986) +++ branches/5.2.x/units/coupons/coupons_event_handler.php (.../coupons_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ Application->GetVar( $event->getPrefixSpecial(true) ); list($id, $field_values) = each($items_info); - $object->SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $object->setID($id); if ( !$object->Validate() ) { Index: branches/5.2.x/units/destinations/dst_event_handler.php =================================================================== diff -u -r14872 -r15047 --- branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 14872) +++ branches/5.2.x/units/destinations/dst_event_handler.php (.../dst_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $this->customProcessing($event, 'before'); if ( $object->Create() ) { Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php =================================================================== diff -u -r14986 -r15047 --- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 14986) +++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php (.../product_option_combinations_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); if (!$object->Validate()) { $event->status = kEvent::erFAIL; $event->redirect = false; @@ -199,7 +199,7 @@ foreach($items_info as $id => $field_values) { $object->Load($id); - $object->SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); if (!$object->Validate()) { $event->status = kEvent::erFAIL; Index: branches/5.2.x/units/orders/orders_item.php =================================================================== diff -u -r14884 -r15047 --- branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 14884) +++ branches/5.2.x/units/orders/orders_item.php (.../orders_item.php) (revision 15047) @@ -1,6 +1,6 @@ GetFieldOptions('PaymentCCExpDate'); Index: branches/5.2.x/units/pricing/pricing_event_handler.php =================================================================== diff -u -r15009 -r15047 --- branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 15009) +++ branches/5.2.x/units/pricing/pricing_event_handler.php (.../pricing_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ Application->GetVar( $event->getPrefixSpecial(true) ); // get pr_tang var uasort($items_info, 'pr_bracket_comp'); - foreach ($items_info as $item_id => $values) { + foreach ($items_info as $item_id => $field_values) { if (in_array($item_id, $stored_ids)) { //if it's already exist $object->Load($item_id); - $object->SetFieldsFromHash($values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); if (!$object->Validate()) { unset($stored_ids[array_search($item_id, $stored_ids)]); @@ -225,7 +225,7 @@ } else { $object->Clear(); - $object->SetFieldsFromHash($values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $object->SetDBField('ProductId', $product_id); if( $object->Create() ) { Index: branches/5.2.x/units/order_items/order_items_event_handler.php =================================================================== diff -u -r15018 -r15047 --- branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 15018) +++ branches/5.2.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ Clear(); // otherwise validation errors will be passed to next object $object->Load($id); - $object->SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $this->customProcessing($event, 'before'); if ( $object->Update($id) ) { Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php =================================================================== diff -u -r14986 -r15047 --- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 14986) +++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php (.../shipping_costs_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $this->customProcessing($event, 'before'); if ( $object->Create() ) { Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== diff -u -r15046 -r15047 --- branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15046) +++ branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ Application->GetVar($event->getPrefixSpecial(true)); - if ( $items_info ) { - $field_values = array_shift($items_info); - } + $field_values = $this->getSubmittedFields($event); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); - $object->SetFieldsFromHash($field_values); - $this->DoResetAddress($object, $from_tab, $to_tab); $object->Update(); Index: branches/5.2.x/units/reports/reports_event_handler.php =================================================================== diff -u -r15009 -r15047 --- branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 15009) +++ branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ getObject( Array('skip_autoload' => true) ); - $object->SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $object->UpdateFormattersMasterFields(); $field_values['offset'] = 0; Index: branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php =================================================================== diff -u -r14986 -r15047 --- branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php (.../affiliate_plans_brackets_event_handler.php) (revision 14986) +++ branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php (.../affiliate_plans_brackets_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ Application->recallObject('BracketsHelper'); + /* @var $brackets_helper kBracketsHelper */ + $brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') ); $brackets_helper->OnPreSaveBrackets($event); } Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php =================================================================== diff -u -r15030 -r15047 --- branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 15030) +++ branches/5.2.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ getSubmittedFields($event); - $object->SetFieldsFromHash($field_values); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); $object->setID(0); if ( !$object->Validate() ) { Index: branches/5.2.x/units/products/products_event_handler.php =================================================================== diff -u -r15044 -r15047 --- branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 15044) +++ branches/5.2.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 15047) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ - $object->SetFieldsFromHash( $this->getSubmittedFields($event) ); + $field_values = $this->getSubmittedFields($event); + $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); if ($object->GetDBField('InventoryStatus') == 2) { // inventory by options (use first selected combination in grid)