Merge pull request #15886 from owncloud/fix-15848-master

Adjust isLocal() on encryption wrapper
This commit is contained in:
Thomas Müller 2015-04-27 15:06:26 +02:00
commit 7d0eba7a41
2 changed files with 7 additions and 1 deletions

View File

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

View File

@ -200,4 +200,7 @@ class Encryption extends \Test\Files\Storage\Storage {
);
}
public function testIsLocal() {
$this->assertFalse($this->instance->isLocal());
}
}