From 8635699db932959ac147193473b014406b0e9e09 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 11 Dec 2012 01:06:21 +0100
Subject: fix cache behaviour for non existing files

---
 lib/files/view.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'lib/files/view.php')

diff --git a/lib/files/view.php b/lib/files/view.php
index 468808566a7..994dbcc85cf 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -691,20 +691,22 @@ class View {
 
 			$data = $cache->get($internalPath);
 
-			if ($data['mimetype'] === 'httpd/unix-directory') {
-				//add the sizes of other mountpoints to the folder
-				$mountPoints = Filesystem::getMountPoints($path);
-				foreach ($mountPoints as $mountPoint) {
-					$subStorage = Filesystem::getStorage($mountPoint);
-					$subCache = $subStorage->getCache();
-					$rootEntry = $subCache->get('');
-
-					$data['size'] += $rootEntry['size'];
+			if ($data) {
+				if ($data['mimetype'] === 'httpd/unix-directory') {
+					//add the sizes of other mountpoints to the folder
+					$mountPoints = Filesystem::getMountPoints($path);
+					foreach ($mountPoints as $mountPoint) {
+						$subStorage = Filesystem::getStorage($mountPoint);
+						$subCache = $subStorage->getCache();
+						$rootEntry = $subCache->get('');
+
+						$data['size'] += $rootEntry['size'];
+					}
 				}
-			}
 
-			$permissionsCache = $storage->getPermissionsCache();
-			$data['permissions'] = $permissionsCache->get($data['fileid'], \OC_User::getUser());
+				$permissionsCache = $storage->getPermissionsCache();
+				$data['permissions'] = $permissionsCache->get($data['fileid'], \OC_User::getUser());
+			}
 		}
 		return $data;
 	}
@@ -888,7 +890,7 @@ class View {
 	 * @param string $path
 	 * @return string
 	 */
-	public function getETag($path){
+	public function getETag($path) {
 		/**
 		 * @var Storage\Storage $storage
 		 * @var string $internalPath
-- 
cgit v1.2.3