diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-27 14:26:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-27 14:26:05 +0200 |
| commit | 936d5640582ad5540d8287a133af06b3c9621bed (patch) | |
| tree | 9da8447fa6510563222912e2be4a0b7339ba1503 | |
| parent | 93c25a1f4af11483baaef447faa235c938b2a444 (diff) | |
| download | nextcloud-server-936d5640582ad5540d8287a133af06b3c9621bed.tar.gz nextcloud-server-936d5640582ad5540d8287a133af06b3c9621bed.zip | |
fixes #15848
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 5 | ||||
| -rw-r--r-- | tests/lib/files/storage/wrapper/encryption.php | 3 |
2 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 af48d3475c3..279e4a86f7c 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -363,7 +363,10 @@ class Encryption extends Wrapper { * @return bool wrapped storage's isLocal() value */ public function isLocal() { - return false; + if ($this->encryptionManager->isEnabled()) { + return false; + } + return $this->storage->isLocal(); } /** diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php index 93bf8c13e9b..6fc9b17fad0 100644 --- a/tests/lib/files/storage/wrapper/encryption.php +++ b/tests/lib/files/storage/wrapper/encryption.php @@ -200,4 +200,7 @@ class Encryption extends \Test\Files\Storage\Storage { ); } + public function testIsLocal() { + $this->assertFalse($this->instance->isLocal()); + } } |