Browse Source

Make sure we have existing indexes before using them

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
tags/v21.0.0beta5
John Molakvoæ (skjnldsv) 3 years ago
parent
commit
07553f0c62
No account linked to committer's email address
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      apps/dav/lib/CalDAV/CalDavBackend.php

+ 4
- 2
apps/dav/lib/CalDAV/CalDavBackend.php View File

@@ -1776,7 +1776,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$calendarAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)));

// If it's shared, limit search to public events
if ($calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
if (isset($calendar['{http://owncloud.org/ns}owner-principal'])
&& $calendar['principaluri'] !== $calendar['{http://owncloud.org/ns}owner-principal']) {
$calendarAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
}

@@ -1788,7 +1789,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('cob.calendartype', $calendarObjectIdQuery->createNamedParameter(self::CALENDAR_TYPE_SUBSCRIPTION)));

// If it's shared, limit search to public events
if ($subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
if (isset($subscription['{http://owncloud.org/ns}owner-principal'])
&& $subscription['principaluri'] !== $subscription['{http://owncloud.org/ns}owner-principal']) {
$subscriptionAnd->add($calendarObjectIdQuery->expr()->eq('co.classification', $calendarObjectIdQuery->createNamedParameter(self::CLASSIFICATION_PUBLIC)));
}


Loading…
Cancel
Save