Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
fix(Calendar): don't try to update deleted resource calendars
fixes #6949

Change-Id: I284a8a70ebba09313371cde576a2d921079595eb
Reviewed-on: http://gerrit.tine20.com/customers/10765
Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  • Loading branch information
pschuele committed Oct 30, 2018
1 parent 7860c5f commit 83e5095
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions tine20/Calendar/Setup/Update/Release11.php
Expand Up @@ -277,11 +277,12 @@ public function update_11()
));

foreach ($containerBackend->search(new Tinebase_Model_ContainerFilter([
['field' => 'application_id', 'operator' => 'equals', 'value' =>
Tinebase_Application::getInstance()->getApplicationByName('Calendar')->getId()],
['field' => 'type', 'operator' => 'equals', 'value' => Tinebase_Model_Container::TYPE_SHARED],
['field' => 'name', 'operator' => 'contains', 'value' => '@']
])) as $container) {
['field' => 'application_id', 'operator' => 'equals', 'value' =>
Tinebase_Application::getInstance()->getApplicationByName('Calendar')->getId()],
['field' => 'type', 'operator' => 'equals', 'value' => Tinebase_Model_Container::TYPE_SHARED],
['field' => 'name', 'operator' => 'contains', 'value' => '@'],
['field' => 'is_deleted', 'operator' => 'equals', 'value' => 0],
])) as $container) {

if (isset($container->xprops()[Calendar_Controller::XPROP_EXTERNAL_INVITATION_CALENDAR]) ||
!preg_match(Tinebase_Mail::EMAIL_ADDRESS_REGEXP, $container->name)) {
Expand Down

0 comments on commit 83e5095

Please sign in to comment.