Fix init

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/appinfo/v1/carddav.php b/apps/dav/appinfo/v1/carddav.php
index d1aeeefb03fa251a920f8c8ce21289ff094f0053..8dea6684742b54183717c06ac4acc4b85e90c9a2 100644 (file)
--- a/apps/dav/appinfo/v1/carddav.php
+++ b/apps/dav/appinfo/v1/carddav.php
@@ -81,7 +81,7 @@ if ($debugging) {
 
 $server->addPlugin(new \Sabre\DAV\Sync\Plugin());
 $server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
-$server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(\OC::$server->getLogger()));
+$server->addPlugin(new \OCA\DAV\CardDAV\ImageExportPlugin(new \OCA\DAV\CardDAV\PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
 $server->addPlugin(new ExceptionLoggerPlugin('carddav', \OC::$server->getLogger()));
 
 // And off we go!

diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index 1984399ebf5af2a201f0d662e3887cb1609117ce..df5b0ea05b69457d59bb434ebfff83d81fed893f 100644 (file)
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -138,7 +138,7 @@ class Server {
                // addressbook plugins
                $this->server->addPlugin(new \OCA\DAV\CardDAV\Plugin());
                $this->server->addPlugin(new VCFExportPlugin());
-               $this->server->addPlugin(new ImageExportPlugin(\OC::$server->getLogger(), new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
+               $this->server->addPlugin(new ImageExportPlugin(new PhotoCache(\OC::$server->getAppDataDir('dav-photocache'))));
 
                // system tags plugins
                $this->server->addPlugin(new SystemTagPlugin(