mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master 

Fix get local file encryption master
This commit is contained in:
Thomas Müller 2015-06-02 13:47:37 +02:00
parent d2f3710ede 35a2fd3f89
commit 3ebc8f0564
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/files/storage/wrapper/encryption.php
View File

@ -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);
}
/**