diff options
Diffstat (limited to 'lib/Service/DocumentService.php')
| -rw-r--r-- | lib/Service/DocumentService.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php index ee82baf82..f88988d52 100644 --- a/lib/Service/DocumentService.php +++ b/lib/Service/DocumentService.php @@ -287,7 +287,7 @@ class DocumentService { $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 { |