Merge branch 'MDL-69214-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE

This commit is contained in:
Eloy Lafuente (stronk7) 2020-07-16 00:01:19 +02:00
commit a869415180

View file

@ -392,7 +392,7 @@ class participants_search {
$forcedgroupjoin = groups_get_members_join($allowedgroupids, $forceduid, $this->context, $forcedjointype); $forcedgroupjoin = groups_get_members_join($allowedgroupids, $forceduid, $this->context, $forcedjointype);
$forcedjoins[] = $forcedgroupjoin->joins; $forcedjoins[] = $forcedgroupjoin->joins;
$forcedwhere .= "AND ({$forcedgroupjoin->wheres})"; $forcedwhere .= " AND ({$forcedgroupjoin->wheres})";
$params = array_merge($params, $forcedgroupjoin->params); $params = array_merge($params, $forcedgroupjoin->params);