Also fixed the returned internal path when getting the root shared item by id

This commit is contained in:
Robin Appelman 2014-04-25 14:04:22 +02:00
parent 672a8248ce
commit b42418246f
1 changed files with 3 additions and 4 deletions

View File

@ -88,7 +88,7 @@ class Shared_Cache extends Cache {
if ($cache = $this->getSourceCache($file)) {
$data = $cache->get($this->files[$file]);
$data['displayname_owner'] = \OC_User::getDisplayName($this->storage->getSharedFrom());
$data['path'] = '';
$data['path'] = $file;
if ($file === '') {
$data['is_share_mount_point'] = true;
}
@ -100,7 +100,6 @@ class Shared_Cache extends Cache {
// cache information for the source item
if (!is_int($file) || $file === 0) {
$file = $this->storage->getSourceId();
$mountPoint = $this->storage->getMountPoint();
}
$query = \OC_DB::prepare(
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
@ -123,8 +122,8 @@ class Shared_Cache extends Cache {
} else {
$data['size'] = (int)$data['size'];
}
if (isset($mountPoint)) {
$data['path'] = 'files/' . $mountPoint;
if (!is_int($file) || $file === 0) {
$data['path'] = '';
$data['is_share_mount_point'] = true;
}
return $data;