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

Merge pull request #5366 from nextcloud/backport-5365 

[stable11] filter missing groups in share provider
This commit is contained in:
Morris Jobke 2017-06-13 08:05:43 -05:00 committed by GitHub
parent b01c39478a 460df4c007
commit 136601ccae
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Group/Manager.php
View File

@ -71,7 +71,7 @@ class Manager extends PublicEmitter implements IGroupManager {
private $cachedGroups = array();
/**
* @var \OC\Group\Group[]
* @var \OC\Group\Group[][]
*/
private $cachedUserGroups = array();

2
lib/private/Share20/DefaultShareProvider.php
View File

@ -736,6 +736,8 @@ class DefaultShareProvider implements IShareProvider {
$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
}
$groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
$groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))