summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/CalDAV/CalDavBackend.php
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-03-02 11:24:56 +0100
committerJoas Schilling <coding@schilljs.com>2017-03-02 12:28:56 +0100
commit6dbdca0721902cf9224f8ec42ff5170810afd388 (patch)
tree233729ffd2d00aaec1769cbff354d14ae8420437 /apps/dav/lib/CalDAV/CalDavBackend.php
parentd8b769bd856cb9b57243ce38fb994e96463f239e (diff)
downloadnextcloud-server-6dbdca0721902cf9224f8ec42ff5170810afd388.tar.gz
nextcloud-server-6dbdca0721902cf9224f8ec42ff5170810afd388.zip
Don't waste energy unless necessary
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/dav/lib/CalDAV/CalDavBackend.php')
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index dfef3111324..e8f1cf979a5 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -278,6 +278,10 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->execute();
while($row = $result->fetch()) {
+ if (isset($calendars[$row['id']])) {
+ continue;
+ }
+
list(, $name) = URLUtil::splitPath($row['principaluri']);
$uri = $row['uri'] . '_shared_by_' . $name;
$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
@@ -301,9 +305,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$calendar[$xmlName] = $row[$dbName];
}
- if (!isset($calendars[$calendar['id']])) {
- $calendars[$calendar['id']] = $calendar;
- }
+ $calendars[$calendar['id']] = $calendar;
}
$result->closeCursor();