summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-02-05 07:39:14 +0100
committerGitHub <noreply@github.com>2020-02-05 07:39:14 +0100
commit062d9dadcb696f3b508d857686ade6db0ff29752 (patch)
tree50fae8f5f3300fe9e160cf3bf8b0c835481614d3
parent7b0f1baa86dc34452577435593591b66e41ea9ac (diff)
parentb0c359ccd2cdcf886547b4b873a5040df6273f2f (diff)
downloadnextcloud-server-062d9dadcb696f3b508d857686ade6db0ff29752.tar.gz
nextcloud-server-062d9dadcb696f3b508d857686ade6db0ff29752.zip
Merge pull request #19297 from nextcloud/backport/19246/stable18
[stable18] Keep the modification time during decryptFile
-rw-r--r--lib/private/Encryption/DecryptAll.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php
index 251b1f7d53c..f7351ec1bed 100644
--- a/lib/private/Encryption/DecryptAll.php
+++ b/lib/private/Encryption/DecryptAll.php
@@ -266,6 +266,7 @@ class DecryptAll {
try {
$this->rootView->copy($source, $target);
+ $this->rootView->touch($target, $fileInfo->getMTime());
$this->rootView->rename($target, $source);
} catch (DecryptionFailedException $e) {
if ($this->rootView->file_exists($target)) {