summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-06-29 15:54:05 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-06-29 15:54:05 +0200
commit372a9afabe9dc038e180312ef90fe9c11c692ef8 (patch)
tree32073f4c1f441fc3decdff834e5a2f715a27ef03
parentf8127046eea132733052f1edf1792012fcef776a (diff)
downloadnextcloud-server-372a9afabe9dc038e180312ef90fe9c11c692ef8.tar.gz
nextcloud-server-372a9afabe9dc038e180312ef90fe9c11c692ef8.zip
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
-rw-r--r--apps/files/appinfo/remote.php2
-rw-r--r--apps/files_sharing/publicwebdav.php2
-rw-r--r--lib/private/connector/sabre/maintenanceplugin.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 325773a81ea..fff3332ef49 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -50,7 +50,7 @@ $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()
// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
-$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin());
+$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
// wait with registering these until auth is handled and the filesystem is setup
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index c75f9d1c7b5..be7530897f6 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -46,7 +46,7 @@ $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()
// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
-$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin());
+$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin(\OC::$server->getConfig()));
$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
// wait with registering these until auth is handled and the filesystem is setup
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index c5a9ca6d54a..634e5a68128 100644
--- a/lib/private/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
@@ -45,7 +45,7 @@ class MaintenancePlugin extends ServerPlugin {
/**
* @param IConfig $config
*/
- public function __construct(IConfig $config) {
+ public function __construct(IConfig $config = null) {
$this->config = $config;
if (is_null($config)) {
$this->config = \OC::$server->getConfig();