Index: branches/5.2.x/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r16001 -r16016 --- branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 16001) +++ branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 16016) @@ -1,6 +1,6 @@ Application->getUnitOption($this->Prefix, 'IDField'); - - $parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix'); - - if ( $parent_prefix && !$this->Application->isAdmin ) { - $foreign_key = $this->Application->getUnitOption($this->Prefix, 'ForeignKey'); - $fields[] = is_array($foreign_key) ? $foreign_key[$parent_prefix] : $foreign_key; - } - - return $fields; - } - - /** * Removes any information about current/selected ids * from Application variables and Session * @@ -1575,7 +1552,8 @@ } 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); $this->customProcessing($event, 'before'); @@ -1590,7 +1568,6 @@ $event->redirect = false; $event->status = kEvent::erFAIL; $this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate'); - $object->setID($id); } /** @@ -1629,7 +1606,7 @@ if ( $items_info ) { 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); $this->customProcessing($event, 'before'); @@ -2203,8 +2180,9 @@ $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ + $object->setID(0); $field_values = $this->getSubmittedFields($event); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); $this->customProcessing($event, 'before'); @@ -2215,7 +2193,6 @@ else { $event->status = kEvent::erFAIL; $event->redirect = false; - $object->setID(0); } } @@ -3453,7 +3430,7 @@ list ($id, $field_values) = each($items_info); $object->Load($id); - $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); + $object->SetFieldsFromHash($field_values); $event->setEventParam('form_data', $field_values); $object->setID($id); @@ -3595,4 +3572,4 @@ { $event->setEventParam('constrain_info', Array ('', '')); } - } \ No newline at end of file + }