diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 13:17:48 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 13:17:48 +0000 |
| commit | e6d4dfc040bbe3cb80a2ce65b82493b557f751fc (patch) | |
| tree | 40bd6366b01b06f4d96fc8638f23a772263cb5e9 /library/Director/Resolver/IcingaObjectResolver.php | |
| parent | Releasing progress-linux version 1.10.2-2~progress7.99u1. (diff) | |
| download | icingaweb2-module-director-e6d4dfc040bbe3cb80a2ce65b82493b557f751fc.tar.xz icingaweb2-module-director-e6d4dfc040bbe3cb80a2ce65b82493b557f751fc.zip | |
Merging upstream version 1.11.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'library/Director/Resolver/IcingaObjectResolver.php')
| -rw-r--r-- | library/Director/Resolver/IcingaObjectResolver.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/Director/Resolver/IcingaObjectResolver.php b/library/Director/Resolver/IcingaObjectResolver.php index 540e2c2..c751476 100644 --- a/library/Director/Resolver/IcingaObjectResolver.php +++ b/library/Director/Resolver/IcingaObjectResolver.php @@ -176,7 +176,7 @@ class IcingaObjectResolver $object->groups = $groups; } - $templates = $this->getTemplateNamesById($id); + $templates = $this->getTemplateNamesByID($id); if (! empty($templates)) { $object->templates = \array_reverse($templates); } @@ -198,7 +198,7 @@ class IcingaObjectResolver } $query = $this->db->select() ->from([ - 'oi' => "${baseTable}_inheritance" + 'oi' => "{$baseTable}_inheritance" ], [ $relColumn, $groupColumn @@ -494,12 +494,12 @@ class IcingaObjectResolver { $type = $this->getType(); $groupsTable = $this->baseTable . 'group'; - $groupMembershipTable = "${groupsTable}_$type"; + $groupMembershipTable = "{$groupsTable}_$type"; if ($resolved) { $groupMembershipTable .= '_resolved'; } - $oRef = "${type}_id"; - $gRef = "${type}group_id"; + $oRef = "{$type}_id"; + $gRef = "{$type}group_id"; return $this->db->select() ->from(['gm' => $groupMembershipTable], [ |