[Pkg-owncloud-commits] [owncloud] 107/215: fixes #15848

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 936d5640582ad5540d8287a133af06b3c9621bed
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Apr 27 14:26:05 2015 +0200

    fixes #15848
---
 lib/private/files/storage/wrapper/encryption.php | 5 ++++-
 tests/lib/files/storage/wrapper/encryption.php   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index af48d34..279e4a8 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 93bf8c1..6fc9b17 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());
+	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git