summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-11-30 14:32:04 +0100
committerGitHub <noreply@github.com>2016-11-30 14:32:04 +0100
commita439b452eb28a379a9eb71e9e4e7404441281674 (patch)
treeb6361a974a17941d0e6620bed3921e452565bf1b
parentc8c586530136431d111e94c853791ba89d720551 (diff)
parent2fd1cf2e92040cc795eded90ba1f05c7e8c5c767 (diff)
downloadnextcloud-server-a439b452eb28a379a9eb71e9e4e7404441281674.tar.gz
nextcloud-server-a439b452eb28a379a9eb71e9e4e7404441281674.zip
Merge pull request #2415 from nextcloud/fix_encrypted_trash_previews
Ignore AppData in encryption wrapper
-rw-r--r--lib/private/Encryption/Util.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index 0e8de5147e1..3afa1bb9596 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -97,6 +97,7 @@ class Util {
$this->config = $config;
$this->excludedPaths[] = 'files_encryption';
+ $this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
}
/**