Merge pull request #8715 from nextcloud/objectstore-no-part-files

disable part files for object stores
nextcloud · Mar 8, 2018 · d054699 · d054699
2 parents cccf6f4 + f5ef9e0
commit d054699
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
@@ -144,6 +144,8 @@ public function put($data) {
 		} 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 @@ public function put($data) {
 
 		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
@@ -429,4 +429,8 @@ public function writeBack($tmpFile, $path) {
 	public function hasUpdated($path, $time) {
 		return false;
 	}
+
+	public function needsPartFile() {
+		return false;
+	}
 }