Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
Fix get local file encryption master
This commit is contained in:
commit
3ebc8f0564
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue