FilterProcessor: Allow behaviors to finish processing

refs Icinga/icingadb-web#1001
Icinga · Mar 26, 2024 · fdedd7f · fdedd7f
1 parent 8e69d1a
commit fdedd7f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/Compat/FilterProcessor.php b/src/Compat/FilterProcessor.php
@@ -139,6 +139,13 @@ protected function requireAndResolveFilterColumns(Filter\Rule $filter, Query $qu
                 if (! $behaviorsApplied) {
                     $rewrittenFilter = $subjectBehaviors->rewriteCondition($filter, $path . '.');
                     if ($rewrittenFilter !== null) {
+                        if (
+                            $rewrittenFilter instanceof MetaDataProvider
+                            && $rewrittenFilter->metaData()->get('forceResolved', false)
+                        ) {
+                            return $rewrittenFilter;
+                        }
+
                         return $this->requireAndResolveFilterColumns($rewrittenFilter, $query, $forceOptimization)
                             ?: $rewrittenFilter;
                     }