From fcd4125d71efc8aaa893bf81cf24659eefaddcae Mon Sep 17 00:00:00 2001 From: Gregory Hargreaves Date: Sat, 20 Oct 2018 14:46:00 +0100 Subject: [PATCH] Fixed bug in GroupMembershipResolver, objects not stored to instance if loading all objects causing mappings to not be stored. --- library/Director/Objects/GroupMembershipResolver.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/library/Director/Objects/GroupMembershipResolver.php b/library/Director/Objects/GroupMembershipResolver.php index 96775ffc..f3624496 100644 --- a/library/Director/Objects/GroupMembershipResolver.php +++ b/library/Director/Objects/GroupMembershipResolver.php @@ -85,7 +85,6 @@ abstract class GroupMembershipResolver $this->recheckAllObjects($this->getAppliedGroups()); if (empty($this->objects)) { Benchmark::measure('Nothing to check, got no qualified object'); - return $this; } @@ -509,11 +508,11 @@ abstract class GroupMembershipResolver $staticGroups = []; if ($this->objects === null) { - $objects = $this->fetchAllObjects(); - } else { - $objects = & $this->objects; + $this->objects = $this->fetchAllObjects(); } + $objects = & $this->objects; + $times = array(); foreach ($objects as $object) { @@ -527,7 +526,6 @@ abstract class GroupMembershipResolver $mt = microtime(true); $id = $object->get('id'); - // TODO: fix this last hard host dependency DynamicApplyMatches::setType($this->type); $resolver = DynamicApplyMatches::prepare($object); foreach ($groups as $groupId => $filter) { @@ -535,7 +533,6 @@ abstract class GroupMembershipResolver if (! array_key_exists($groupId, $mappings)) { $mappings[$groupId] = []; } - $mappings[$groupId][$id] = $id; } }