Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
This commit is contained in:
parent
f8127046ee
commit
372a9afabe
|
@ -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 /
|
// 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\DummyGetResponsePlugin());
|
||||||
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
|
$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()));
|
$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
|
||||||
|
|
||||||
// wait with registering these until auth is handled and the filesystem is setup
|
// wait with registering these until auth is handled and the filesystem is setup
|
||||||
|
|
|
@ -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 /
|
// 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\DummyGetResponsePlugin());
|
||||||
$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
|
$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()));
|
$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
|
||||||
|
|
||||||
// wait with registering these until auth is handled and the filesystem is setup
|
// wait with registering these until auth is handled and the filesystem is setup
|
||||||
|
|
|
@ -45,7 +45,7 @@ class MaintenancePlugin extends ServerPlugin {
|
||||||
/**
|
/**
|
||||||
* @param IConfig $config
|
* @param IConfig $config
|
||||||
*/
|
*/
|
||||||
public function __construct(IConfig $config) {
|
public function __construct(IConfig $config = null) {
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
if (is_null($config)) {
|
if (is_null($config)) {
|
||||||
$this->config = \OC::$server->getConfig();
|
$this->config = \OC::$server->getConfig();
|
||||||
|
|
Loading…
Reference in New Issue