diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-03-09 16:06:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-09 16:06:52 +0300 |
commit | aee8381f21dd18aad4fb3aca7990af195e0ded05 (patch) | |
tree | 1d6376875934dc93888767f7ff1aacc5ee8f6184 | |
parent | 6bd630d2ea797c9eeb4053d8b799dfbb27d6b223 (diff) | |
parent | 550f9cafc8ac9a8da4c3eeecdb6739dd0ed593cf (diff) |
Merge pull request #8726 from nextcloud/objectstore-no-part-files-12
[12] disable part files for object stores
-rw-r--r-- | apps/dav/lib/Connector/Sabre/File.php | 8 | ||||
-rw-r--r-- | lib/private/Files/ObjectStore/ObjectStoreStorage.php | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index ab04890d6c7..f5a482c8567 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -117,6 +117,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) @@ -161,11 +163,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); diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index acb8d670780..4c540071471 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -424,4 +424,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { public function hasUpdated($path, $time) { return false; } + + public function needsPartFile() { + return false; + } } |