Skip to content

Commit

Permalink
Merge branch '2024.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
gitlabci committed Nov 27, 2024
2 parents 06d1f24 + a55e92c commit 8669f8c
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions tine20/Calendar/Controller/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -2421,12 +2421,19 @@ protected function _inspectEvent($_record, $skipEvent = false)

if (! $container instanceof Tinebase_Model_Container || $container->type == Tinebase_Model_Container::TYPE_PERSONAL) {
// move into special (external users) container
$container = Calendar_Controller::getInstance()->getInvitationContainer($_record->organizer_email ? null : $_record->resolveOrganizer(), $_record->organizer_email);
if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__
. ' Setting container_id to ' . $container->getId() . ' for external organizer ' . ($_record->organizer_email ?: $_record->organizer?->email));
$_record->container_id = $container->getId();
try {
$container = Calendar_Controller::getInstance()->getInvitationContainer($_record->organizer_email ? null : $_record->resolveOrganizer(), $_record->organizer_email);
if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__
. ' Setting container_id to ' . $container->getId() . ' for external organizer ' . ($_record->organizer_email ?: $_record->organizer?->email));
$_record->container_id = $container->getId();
} catch (Tinebase_Exception_UnexpectedValue $teuv) {
// do not move ...
if (Tinebase_Core::isLogLevel(Zend_Log::NOTICE)) {
Tinebase_Core::getLogger()->notice(__METHOD__ . '::' . __LINE__
. ' Could not move event: ' . $teuv->getMessage());
}
}
}

}

if ($_record->is_all_day_event) {
Expand Down

0 comments on commit 8669f8c

Please sign in to comment.