From 35a2fd3f89c0aa71ee699ed26e66f6507cb28aec Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 6 May 2015 11:16:44 +0200
Subject: Only return cached files if existing

---
 lib/private/files/storage/wrapper/encryption.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/private/files')

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index d73ff6638b2..64490554b56 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);
 	}
-- 
cgit v1.2.3