mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12549 from owncloud/shared-cache-non-existing 

Dont return cached date in shared cache when the file doesn't exist
This commit is contained in:
Morris Jobke 2014-12-10 08:49:40 +01:00
parent ea95bb0189 ce10b93519
commit 3026cdbc80
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files_sharing/lib/cache.php
View File

@ -89,16 +89,18 @@ class Shared_Cache extends Cache {
$cache = $this->getSourceCache($file); $cache = $this->getSourceCache($file);
if ($cache) { if ($cache) {
$data = $cache->get($this->files[$file]); $data = $cache->get($this->files[$file]);
$data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom()); if ($data) {
$data['path'] = $file; $data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom());
if ($file === '') { $data['path'] = $file;
$data['is_share_mount_point'] = true; if ($file === '') {
} $data['is_share_mount_point'] = true;
$data['uid_owner'] = $this->storage->getOwner($file); }
if (isset($data['permissions'])) { $data['uid_owner'] = $this->storage->getOwner($file);
$data['permissions'] &= $this->storage->getPermissions($file); if (isset($data['permissions'])) {
} else { $data['permissions'] &= $this->storage->getPermissions($file);
$data['permissions'] = $this->storage->getPermissions($file); } else {
$data['permissions'] = $this->storage->getPermissions($file);
}
} }
return $data; return $data;
} }