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

Merge pull request #5343 from nextcloud/share-filter-missing-groups 

filter missing groups in share provider
This commit is contained in:
Lukas Reschke 2017-06-13 10:53:26 +02:00 committed by GitHub
parent 6a06df824e f707a40f19
commit c46422b780
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

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

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

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