Merge remote-tracking branch 'upstream/dev' into plugin-repo

This commit is contained in:
Andrew Manning 2016-05-07 18:39:34 -04:00
commit bbbae3f42d

View File

@ -91,10 +91,10 @@ class Dav extends \Zotlabs\Web\Controller {
$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
// A SabreDAV server-object // A SabreDAV server-object
$server = new \SDAV\Server($rootDirectory); $server = new SDAV\Server($rootDirectory);
// prevent overwriting changes each other with a lock backend // prevent overwriting changes each other with a lock backend
$lockBackend = new \SDAV\Locks\Backend\File('store/[data]/locks'); $lockBackend = new SDAV\Locks\Backend\File('store/[data]/locks');
$lockPlugin = new \SDAV\Locks\Plugin($lockBackend); $lockPlugin = new SDAV\Locks\Plugin($lockBackend);
$server->addPlugin($lockPlugin); $server->addPlugin($lockPlugin);