[Pkg-owncloud-commits] [owncloud] 02/457: Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others

[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 a96c2b83545b67df4e5f91d56c528288e20f41d6
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue May 5 16:19:24 2015 +0200

    Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others
---
 lib/private/files/storage/wrapper/encryption.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 41a7f9e..d73ff66 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -364,7 +364,10 @@ class Encryption extends Wrapper {
 	 * @return string
 	 */
 	public function getLocalFile($path) {
-		return $this->getCachedFile($path);
+		if ($this->encryptionManager->isEnabled()) {
+			return $this->getCachedFile($path);
+		}
+		return $this->storage->getLocalFile($path);
 	}
 
 	/**

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