diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-09-06 22:48:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-06 22:48:46 +0200 |
commit | 8e6d86a862576ab23d884700700580f44cc8cac3 (patch) | |
tree | ffd5d03dd60a2345ef7478ddcc56a84e85e78405 /apps/dav/lib/Server.php | |
parent | a10c4517cbb20625b5ee32c1809bee40ecbb5456 (diff) | |
parent | a1df91da9d1c2ea7e81601e2cf66ae747536d61f (diff) | |
download | nextcloud-server-8e6d86a862576ab23d884700700580f44cc8cac3.tar.gz nextcloud-server-8e6d86a862576ab23d884700700580f44cc8cac3.zip |
Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for_past_events
don't send invitation emails for past events
Diffstat (limited to 'apps/dav/lib/Server.php')
-rw-r--r-- | apps/dav/lib/Server.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php index b93f3e6390a..ac0abc8b4eb 100644 --- a/apps/dav/lib/Server.php +++ b/apps/dav/lib/Server.php @@ -28,6 +28,7 @@ */ namespace OCA\DAV; +use OC\AppFramework\Utility\TimeFactory; use OCA\DAV\CalDAV\Schedule\IMipPlugin; use OCA\DAV\CardDAV\ImageExportPlugin; use OCA\DAV\CardDAV\PhotoCache; @@ -74,6 +75,7 @@ class Server { $logger = \OC::$server->getLogger(); $mailer = \OC::$server->getMailer(); $dispatcher = \OC::$server->getEventDispatcher(); + $timezone = new TimeFactory(); $root = new RootCollection(); $this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root)); @@ -135,7 +137,7 @@ class Server { $this->server->addPlugin(new \OCA\DAV\CalDAV\Plugin()); $this->server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin()); $this->server->addPlugin(new \OCA\DAV\CalDAV\Schedule\Plugin()); - $this->server->addPlugin(new IMipPlugin($mailer, $logger)); + $this->server->addPlugin(new IMipPlugin($mailer, $logger, $timezone)); $this->server->addPlugin(new \Sabre\CalDAV\Subscriptions\Plugin()); $this->server->addPlugin(new \Sabre\CalDAV\Notifications\Plugin()); $this->server->addPlugin(new DAV\Sharing\Plugin($authBackend, \OC::$server->getRequest())); |