wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure that we always return the correct permissions

Browse source
This commit is contained in:
Bjoern Schiessle 2014-06-24 13:39:37 +02:00
parent 6a4a474aa9
commit 84d36df70b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_sharing/lib/cache.php
View file

@ -95,9 +95,9 @@ class Shared_Cache extends Cache {
}
$data['uid_owner'] = $this->storage->getOwner($file);
if (isset($data['permissions'])) {
$data['permissions'] &= $this->storage->getPermissions('');
$data['permissions'] &= $this->storage->getPermissions($file);
} else {
$data['permissions'] = $this->storage->getPermissions('');
$data['permissions'] = $this->storage->getPermissions($file);
}
return $data;
}
@ -163,7 +163,7 @@ class Shared_Cache extends Cache {
$sourceFolderContent[$key]['path'] = $dir . $c['name'];
$sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner'];
$sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner'];
$sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions('');
$sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']);
}
return $sourceFolderContent;

4
lib/private/files/view.php
View file

@ -884,8 +884,8 @@ class View {
if ($extOnly && $subStorage instanceof \OC\Files\Storage\Shared) {
continue;
}
$subCache = $subStorage->getCache('');
$rootEntry = $subCache->get('');
$subCache = $subStorage->getCache($internalPath);
$rootEntry = $subCache->get($internalPath);
$data['size'] += isset($rootEntry['size']) ? $rootEntry['size'] : 0;
}
}