diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-03-26 14:26:07 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-03-26 14:26:07 +0100 |
| commit | 371a924c92bb751b81e2a819d8c581743be7a797 (patch) | |
| tree | f0b1ec313deb42850ca754c5894737dc2a0a8fb9 /apps/files/appinfo | |
| parent | db6fb198fe7b8fa854050730b32d58d3787505b3 (diff) | |
| parent | 028973cbea865075a32db6228b56b7d3960771d6 (diff) | |
| download | nextcloud-server-371a924c92bb751b81e2a819d8c581743be7a797.tar.gz nextcloud-server-371a924c92bb751b81e2a819d8c581743be7a797.zip | |
merge master into webdav-injection
Diffstat (limited to 'apps/files/appinfo')
| -rw-r--r-- | apps/files/appinfo/app.php | 7 | ||||
| -rw-r--r-- | apps/files/appinfo/remote.php | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 909baca92ea..15a29133789 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -12,13 +12,6 @@ OCP\App::addNavigationEntry(array("id" => "files_index", OC_Search::registerProvider('OC_Search_Provider_File'); -// cache hooks must be connected before all other apps. -// since 'files' is always loaded first the hooks need to be connected here -\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook'); -\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook'); -\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook'); -\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook'); - \OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext'); $templateManager = OC_Helper::getFileTemplateManager(); diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index d9c667c0106..1b2d144da5c 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -44,7 +44,6 @@ $server->setBaseUri($baseuri); $defaults = new OC_Defaults(); $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName())); $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend)); -$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload $server->addPlugin(new OC_Connector_Sabre_FilesPlugin()); $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin()); $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav')); |