Index: branches/RC/core/units/general/helpers/controls/edit_picker_helper.php =================================================================== diff -u -N -r10528 -r10780 --- branches/RC/core/units/general/helpers/controls/edit_picker_helper.php (.../edit_picker_helper.php) (revision 10528) +++ branches/RC/core/units/general/helpers/controls/edit_picker_helper.php (.../edit_picker_helper.php) (revision 10780) @@ -75,6 +75,8 @@ function SaveValues(&$sub_event, $store_field, $sub_prefix_field) { $main_object =& $sub_event->MasterEvent->getObject(); + /* @var $main_object kDBItem */ + $affected_field = $main_object->GetDBField($store_field); $object =& $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array('skip_autoload' => true)); @@ -95,7 +97,7 @@ $records_to_add = array_diff($new_values, $old_values); $records_to_delete = array_diff($old_values, $new_values); - if ($records_to_delete) { + if ($records_to_delete && $main_object->Loaded) { $where_clause = Array ( $foreign_key . ' = ' . $main_object->GetID(), $sub_prefix_field . ' IN (' . implode(',', $records_to_delete) . ')',