Skip to content

Test server PR nextcloud/server#34918 #8312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nickvergessen wants to merge 3 commits into from
Closed

Test server PR nextcloud/server#34918 #8312

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aa9500
Fix permissions returned by getSharesInFolder
starypatyk Nov 5, 2022
5ad25b8
Test server PR nextcloud/server#34918
nickvergessen Nov 8, 2022
c9a48fa
Merge branch 'bugfix/noid/permissions_get_shares_in_folder' into serv…
nickvergessen Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/Share/RoomShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,11 @@ public function move(IShare $share, $recipient): IShare {
*/
public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true): array {
$qb = $this->dbConnection->getQueryBuilder();
$qb->select('*')
$qb->select('s.*',
'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
)
->from('share', 's')
->andWhere($qb->expr()->orX(
$qb->expr()->eq('s.item_type', $qb->createNamedParameter('file')),
Expand Down