summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/appinfo/database.xml2
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/appinfo/database.xml b/apps/dav/appinfo/database.xml
index de87f02e8f8..b3a69de070c 100644
--- a/apps/dav/appinfo/database.xml
+++ b/apps/dav/appinfo/database.xml
@@ -671,7 +671,7 @@ CREATE TABLE calendarobjects (
</table>
<table>
- <name>*dbprefix*calendarobjects_properties</name>
+ <name>*dbprefix*calendarobjects_props</name>
<declaration>
<field>
<name>id</name>
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index a2b7a2e83b2..fcf73cb0f31 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -149,7 +149,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
private $legacyEndpoint;
/** @var string */
- private $dbObjectPropertiesTable = 'calendarobjects_properties';
+ private $dbObjectPropertiesTable = 'calendarobjects_props';
/**
* CalDavBackend constructor.
@@ -1286,7 +1286,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
}
$query->select(['c.calendarid', 'c.uri'])
- ->from('calendarobjects_properties', 'i')
+ ->from($this->dbObjectPropertiesTable, 'i')
->join('i', 'calendarobjects', 'c', $query->expr()->eq('i.objectid', 'c.id'))
->where($calExpr)
->andWhere($compExpr)