Merge pull request nextcloud#12549 from owncloud/shared-cache-non-exi…

…sting Dont return cached date in shared cache when the file doesn't exist
small1 · Dec 10, 2014 · 3026cdb · 3026cdb
2 parents ea95bb0 + ce10b93
commit 3026cdb
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
@@ -89,16 +89,18 @@ public function get($file) {
 			$cache = $this->getSourceCache($file);
 			if ($cache) {
 				$data = $cache->get($this->files[$file]);
-				$data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom());
-				$data['path'] = $file;
-				if ($file === '') {
-					$data['is_share_mount_point'] = true;
-				}
-				$data['uid_owner'] = $this->storage->getOwner($file);
-				if (isset($data['permissions'])) {
-					$data['permissions'] &= $this->storage->getPermissions($file);
-				} else {
-					$data['permissions'] = $this->storage->getPermissions($file);
+				if ($data) {
+					$data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom());
+					$data['path'] = $file;
+					if ($file === '') {
+						$data['is_share_mount_point'] = true;
+					}
+					$data['uid_owner'] = $this->storage->getOwner($file);
+					if (isset($data['permissions'])) {
+						$data['permissions'] &= $this->storage->getPermissions($file);
+					} else {
+						$data['permissions'] = $this->storage->getPermissions($file);
+					}
 				}
 				return $data;
 			}