[Pkg-owncloud-commits] [owncloud] 03/457: Only return cached files if existing

[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 35a2fd3f89c0aa71ee699ed26e66f6507cb28aec
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed May 6 11:16:44 2015 +0200

    Only return cached files if existing
---
 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 d73ff66..6449055 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -365,7 +365,10 @@ class Encryption extends Wrapper {
 	 */
 	public function getLocalFile($path) {
 		if ($this->encryptionManager->isEnabled()) {
-			return $this->getCachedFile($path);
+			$cachedFile = $this->getCachedFile($path);
+			if (is_string($cachedFile)) {
+				return $cachedFile;
+			}
 		}
 		return $this->storage->getLocalFile($path);
 	}

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