Index: core/units/categories/categories_event_handler.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/categories/categories_event_handler.php (revision 15698) +++ core/units/categories/categories_event_handler.php (revision ) @@ -975,7 +975,7 @@ $ids = $this->Conn->GetCol($sql); if ( $ids ) { - $temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event->MasterEvent)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('system-event-subscription', '', $ids); @@ -1323,7 +1323,7 @@ $this->Application->SetVar('m_cat_id', $dest_cat); $item_ids = $this->Conn->GetCol( sprintf($ids_sql, implode(',', $item_resource_ids) ) ); - $temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); if($item_ids) $temp->CloneItems($event->Prefix, $event->Special, $item_ids); } \ No newline at end of file Index: core/kernel/utility/temp_handler.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/kernel/utility/temp_handler.php (revision 15731) +++ core/kernel/utility/temp_handler.php (revision ) @@ -63,7 +63,10 @@ public function BuildTables($prefix, $ids) { $this->_tables = new kTempHandlerTopTable($prefix, $ids); + + if ( is_object($this->parentEvent) ) { - $this->_tables->setParentEvent($this->parentEvent); + $this->_tables->setParentEvent($this->parentEvent); + } } /** \ No newline at end of file Index: core/units/users/users_event_handler.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/users/users_event_handler.php (revision 15698) +++ core/units/users/users_event_handler.php (revision ) @@ -766,7 +766,7 @@ } if ( $object->isSubscriberOnly() ) { - $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, '', Array($object->GetID())); @@ -1582,7 +1582,7 @@ return; } - $temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $ids = $this->StoreSelectedIDs($event); Index: core/units/forms/submission_log/submission_log_eh.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/forms/submission_log/submission_log_eh.php (revision 15698) +++ core/units/forms/submission_log/submission_log_eh.php (revision ) @@ -696,7 +696,7 @@ // get existing draft for given submission and user $draft->Load($load_keys); if ($draft->isLoaded()) { - $temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('draft', '', Array ($draft->GetID())); \ No newline at end of file Index: core/units/scheduled_tasks/scheduled_task_eh.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/scheduled_tasks/scheduled_task_eh.php (revision 15698) +++ core/units/scheduled_tasks/scheduled_task_eh.php (revision ) @@ -110,7 +110,7 @@ $delete_ids = $this->Conn->GetCol($sql); if ($delete_ids) { - $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, $delete_ids); \ No newline at end of file Index: core/kernel/db/cat_event_handler.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/kernel/db/cat_event_handler.php (revision 15698) +++ core/kernel/db/cat_event_handler.php (revision ) @@ -292,7 +292,7 @@ } if ( $clipboard_data['copy'] ) { - $temp = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); + $temp = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp kTempTablesHandler */ $this->Application->SetVar('ResetCatBeforeClone', 1); // used in "kCatDBEventHandler::OnBeforeClone" @@ -354,7 +354,7 @@ $ids = $to_delete; } - $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $event->setEventParam('ids', $ids); @@ -2233,7 +2233,7 @@ if ( $perm_helper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $event->Prefix) == 2 ) { // 1. clone original item - $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array ($object->GetID()), NULL, NULL, NULL, true); @@ -2496,7 +2496,7 @@ $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ - $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $owner_field = $this->getOwnerField($event->Prefix); \ No newline at end of file Index: core/units/spam_reports/spam_report_eh.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/spam_reports/spam_report_eh.php (revision 15682) +++ core/units/spam_reports/spam_report_eh.php (revision ) @@ -134,7 +134,7 @@ $item_prefix = $object->GetDBField('ItemPrefix'); if ( !isset($temp_handlers[$item_prefix]) ) { - $temp_handlers[$item_prefix] = $this->Application->recallObject($item_prefix . '_TempHandler', 'kTempTablesHandler'); + $temp_handlers[$item_prefix] = $this->Application->recallObject($item_prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); } $temp_handlers[$item_prefix]->DeleteItems($item_prefix, '', Array ($object->GetDBField('ItemId'))); \ No newline at end of file Index: core/units/logs/session_logs/session_log_eh.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/logs/session_logs/session_log_eh.php (revision 15698) +++ core/units/logs/session_logs/session_log_eh.php (revision ) @@ -122,7 +122,7 @@ $related_ids = $this->Conn->GetCol($sql); if ( $related_ids ) { - $temp_handler = $this->Application->recallObject('change-log_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject('change-log_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event->MasterEvent)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('change-log', '', $related_ids); \ No newline at end of file Index: core/units/page_revisions/page_revision_eh.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/page_revisions/page_revision_eh.php (revision 15698) +++ core/units/page_revisions/page_revision_eh.php (revision ) @@ -287,7 +287,7 @@ $revision_id = $this->getCurrentDraftRevision($event); if ( $revision_id ) { - $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($revision_id)); Index: core/units/email_templates/email_template_eh.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/email_templates/email_template_eh.php (revision 15698) +++ core/units/email_templates/email_template_eh.php (revision ) @@ -720,7 +720,7 @@ return; } - $temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event->MasterEvent)); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('system-event-subscription', '', $ids); \ No newline at end of file