diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-27 15:06:26 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-27 15:06:26 +0200 |
| commit | 7d0eba7a417b28b6dbf12db277be0ed03e8cd0bc (patch) | |
| tree | 30012c0381b1ce077c790bf4ab19f261f622dc3b | |
| parent | 678b7d7e4d042ede16261c7eae659b10e597fd55 (diff) | |
| parent | 936d5640582ad5540d8287a133af06b3c9621bed (diff) | |
| download | nextcloud-server-7d0eba7a417b28b6dbf12db277be0ed03e8cd0bc.tar.gz nextcloud-server-7d0eba7a417b28b6dbf12db277be0ed03e8cd0bc.zip | |
Merge pull request #15886 from owncloud/fix-15848-master
Adjust isLocal() on encryption wrapper
| -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 e3458cb6bba..41a7f9e9242 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -373,7 +373,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()); + } } |