summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/CalDAV
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-03-30 09:34:25 +0200
committerGitHub <noreply@github.com>2020-03-30 09:34:25 +0200
commit2200cc85629f449dc8cb747cd6aa0049a3cdab6d (patch)
treeaea025990e7f9e684f7ab7a7a4bdbdf90d262cf1 /apps/dav/lib/CalDAV
parent9e8ac1d24a5cd5f41c0b160d79be49195d4bf8b9 (diff)
parent55081b7fd29b58600d5e0d13ed678de902098e4f (diff)
downloadnextcloud-server-2200cc85629f449dc8cb747cd6aa0049a3cdab6d.tar.gz
nextcloud-server-2200cc85629f449dc8cb747cd6aa0049a3cdab6d.zip
Merge pull request #19325 from nextcloud/dependachristoph/composer/sabre-4.0
Update Sabre (and friends) to 4.0
Diffstat (limited to 'apps/dav/lib/CalDAV')
-rw-r--r--apps/dav/lib/CalDAV/BirthdayService.php1
-rw-r--r--apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php2
-rw-r--r--apps/dav/lib/CalDAV/WebcalCaching/Plugin.php2
3 files changed, 3 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
index 31ea38fc7b7..208b923f531 100644
--- a/apps/dav/lib/CalDAV/BirthdayService.php
+++ b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -256,6 +256,7 @@ class BirthdayService {
$vCal = new VCalendar();
$vCal->VERSION = '2.0';
+ $vCal->PRODID = '-//IDN nextcloud.com//Birthday calendar//EN';
$vEvent = $vCal->createComponent('VEVENT');
$vEvent->add('DTSTART');
$vEvent->DTSTART->setDateTime(
diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
index 0702d8fc9ad..e285bbc378c 100644
--- a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
+++ b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
@@ -94,7 +94,7 @@ class InvitationResponseServer {
));
// wait with registering these until auth is handled and the filesystem is setup
- $this->server->on('beforeMethod', function () use ($root) {
+ $this->server->on('beforeMethod:*', function () use ($root) {
// register plugins from apps
$pluginManager = new PluginManager(
\OC::$server,
diff --git a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php
index cea11de395c..783c73968be 100644
--- a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php
+++ b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php
@@ -83,7 +83,7 @@ class Plugin extends ServerPlugin {
*/
public function initialize(Server $server) {
$this->server = $server;
- $server->on('beforeMethod', [$this, 'beforeMethod']);
+ $server->on('beforeMethod:*', [$this, 'beforeMethod']);
}
/**