Also take mtime into account for change detection during editing

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Apr 21, 2022 · d17137d · d17137d
1 parent 891f369
commit d17137d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php
@@ -287,7 +287,7 @@ public function autosave($file, $documentId, $version, $autoaveDocument, $force
 		$savedEtag = $file->getEtag();
 		$lastMTime = $document->getLastSavedVersionTime();
 
-		if ($lastMTime > 0 && $savedEtag !== $document->getLastSavedVersionEtag() && $force === false) {
+		if ($lastMTime > 0 && $savedEtag !== $document->getLastSavedVersionEtag() && $lastMTime !== $file->getMtime() && $force === false) {
 			if (!$this->cache->get('document-save-lock-' . $documentId)) {
 				throw new DocumentSaveConflictException('File changed in the meantime from outside');
 			} else {