From a96c2b83545b67df4e5f91d56c528288e20f41d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 5 May 2015 16:19:24 +0200 Subject: [PATCH] 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 --- lib/private/files/storage/wrapper/encryption.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 41a7f9e924..d73ff6638b 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); } /**