summaryrefslogtreecommitdiffstats
path: root/lib/private/files/storage/wrapper/encryption.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-05-06 11:16:44 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-05-06 11:16:44 +0200
commit35a2fd3f89c0aa71ee699ed26e66f6507cb28aec (patch)
treef92630bfa82818c5c245a95b92c0848f02bf0292 /lib/private/files/storage/wrapper/encryption.php
parenta96c2b83545b67df4e5f91d56c528288e20f41d6 (diff)
downloadnextcloud-server-35a2fd3f89c0aa71ee699ed26e66f6507cb28aec.tar.gz
nextcloud-server-35a2fd3f89c0aa71ee699ed26e66f6507cb28aec.zip
Only return cached files if existing
Diffstat (limited to 'lib/private/files/storage/wrapper/encryption.php')
-rw-r--r--lib/private/files/storage/wrapper/encryption.php5
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 d73ff6638b2..64490554b56 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -365,7 +365,10 @@ class Encryption extends Wrapper {
*/
public function getLocalFile($path) {
if ($this->encryptionManager->isEnabled()) {
- return $this->getCachedFile($path);
+ $cachedFile = $this->getCachedFile($path);
+ if (is_string($cachedFile)) {
+ return $cachedFile;
+ }
}
return $this->storage->getLocalFile($path);
}