summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-03-09 10:34:33 +0100
committerGitHub <noreply@github.com>2018-03-09 10:34:33 +0100
commit4fa0cac17c5b359e4351fbeccef6b8692c7dc3db (patch)
tree43a88e5fa72c385551b8caf59a08ff221939cbb6 /apps
parentd1547ee3b07b6a553dbbb4bcdd03f0d348b23156 (diff)
parent9342f97a28f20471643728b3c735772c0dd108f1 (diff)
downloadnextcloud-server-4fa0cac17c5b359e4351fbeccef6b8692c7dc3db.tar.gz
nextcloud-server-4fa0cac17c5b359e4351fbeccef6b8692c7dc3db.zip
Merge pull request #8725 from nextcloud/objectstore-no-part-files-13
[13] disable part files for object stores
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/File.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 597e6ebef90..6a467e9eff2 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -144,6 +144,8 @@ class File extends Node implements IFile {
} else {
// upload file directly as the final path
$partFilePath = $this->path;
+
+ $this->emitPreHooks($exists);
}
// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
@@ -188,11 +190,7 @@ class File extends Node implements IFile {
try {
$view = \OC\Files\Filesystem::getView();
- if ($view) {
- $run = $this->emitPreHooks($exists);
- } else {
- $run = true;
- }
+ $run = ($view && $needsPartFile) ? $this->emitPreHooks($exists) : true;
try {
$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);