diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-02 13:47:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-06-02 13:47:37 +0200 |
| commit | 3ebc8f0564395fbb519fc4275e0f6f883df708b7 (patch) | |
| tree | 8db91afb73d96246a242fb5702ef84e1bcc5a1dc | |
| parent | d2f3710ede1fa72658a4c12264a90a1936faf9ca (diff) | |
| parent | 35a2fd3f89c0aa71ee699ed26e66f6507cb28aec (diff) | |
| download | nextcloud-server-3ebc8f0564395fbb519fc4275e0f6f883df708b7.tar.gz nextcloud-server-3ebc8f0564395fbb519fc4275e0f6f883df708b7.zip | |
Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
Fix get local file encryption master
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index d1e22bb6d40..056f823c18b 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -535,7 +535,13 @@ class Encryption extends Wrapper { * @return string */ public function getLocalFile($path) { - return $this->getCachedFile($path); + if ($this->encryptionManager->isEnabled()) { + $cachedFile = $this->getCachedFile($path); + if (is_string($cachedFile)) { + return $cachedFile; + } + } + return $this->storage->getLocalFile($path); } /** |