diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-05 16:19:24 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-05-05 16:19:24 +0200 |
| commit | a96c2b83545b67df4e5f91d56c528288e20f41d6 (patch) | |
| tree | a7aafd89ae8e4370ba9bb76fe3ecc6e63c072c31 | |
| parent | 767cf2774a5f357b3860034b3fe854d19f38bd15 (diff) | |
| download | nextcloud-server-a96c2b83545b67df4e5f91d56c528288e20f41d6.tar.gz nextcloud-server-a96c2b83545b67df4e5f91d56c528288e20f41d6.zip | |
Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 41a7f9e9242..d73ff6638b2 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -364,7 +364,10 @@ class Encryption extends Wrapper { * @return string */ public function getLocalFile($path) { - return $this->getCachedFile($path); + if ($this->encryptionManager->isEnabled()) { + return $this->getCachedFile($path); + } + return $this->storage->getLocalFile($path); } /** |