From fe743086bc4e5c17016c4f839f528148a826e648 Mon Sep 17 00:00:00 2001
From: Marc DeTrano <marc@gridshield.net>
Date: Mon, 4 Aug 2025 11:07:30 -0600
Subject: [PATCH] remove unneeded fetchHostVars and fetchCustomVars calls in
 detail view extension

---
 .../ProvidedHook/Icingadb/ServiceDetailExtension.php      | 1 -
 .../ProvidedHook/Monitoring/DetailviewExtension.php       | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/Businessprocess/ProvidedHook/Icingadb/ServiceDetailExtension.php b/library/Businessprocess/ProvidedHook/Icingadb/ServiceDetailExtension.php
index 6eab701..746b2bf 100644
--- a/library/Businessprocess/ProvidedHook/Icingadb/ServiceDetailExtension.php
+++ b/library/Businessprocess/ProvidedHook/Icingadb/ServiceDetailExtension.php
@@ -57,7 +57,6 @@ class ServiceDetailExtension extends ServiceDetailExtensionHook
                 'tree_var',
                 'icingaweb_businessprocess_as_tree'
             );
-
         } catch (\Exception $e) {
             // Ignore and don't display anything
         }
diff --git a/library/Businessprocess/ProvidedHook/Monitoring/DetailviewExtension.php b/library/Businessprocess/ProvidedHook/Monitoring/DetailviewExtension.php
index 0c676a2..f4871ea 100644
--- a/library/Businessprocess/ProvidedHook/Monitoring/DetailviewExtension.php
+++ b/library/Businessprocess/ProvidedHook/Monitoring/DetailviewExtension.php
@@ -76,9 +76,9 @@ class DetailviewExtension extends DetailviewExtensionHook
             return '';
         }
 
-        $customvars = array_merge($object->fetchHostVariables()->hostVariables, $object->fetchCustomvars()->customvars);  #Must grab customvars with this method, object access will not work with coalesce operator
-
-        $bpName = $customvars[$this->configVar] ?? null; 
+        # Grab custom vars first, merge service over host vars
+        $customvars = array_merge($object->hostVariables, $object->customvars);
+        $bpName = $customvars[$this->configVar] ?? null;
         if (! $bpName) {
             $bpName = key($this->storage->listProcessNames());
         }
@@ -93,7 +93,7 @@ class DetailviewExtension extends DetailviewExtensionHook
 
         MonitoringState::apply($bp);
 
-        if (filter_var( $customvars[$this->treeVar] ?? false, FILTER_VALIDATE_BOOLEAN)) {
+        if (filter_var($customvars[$this->treeVar] ?? false, FILTER_VALIDATE_BOOLEAN)) {
             $renderer = new TreeRenderer($bp, $node);
             $tag = 'ul';
         } else {