summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/files/storage/wrapper/encryption.php5
-rw-r--r--tests/lib/files/storage/wrapper/encryption.php3
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());
+ }
}