diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2017-04-26 10:06:10 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2017-04-28 20:21:46 +0200 |
| commit | 0f8a9514de445c47a79d18a3ca075295398b4c60 (patch) | |
| tree | d0317cc391336ea68f86bdd7d9bb9d4466bc710a /apps/dav | |
| parent | 8d00458b568185dfb405c79f38930bc4a64855ff (diff) | |
| download | nextcloud-server-0f8a9514de445c47a79d18a3ca075295398b4c60.tar.gz nextcloud-server-0f8a9514de445c47a79d18a3ca075295398b4c60.zip | |
rename calendarobjects_properties -> calendarobjects_props
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/appinfo/database.xml | 2 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 4 |
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) |