MERGE: Merge branch '4.2' into 4.3

neos · Dec 13, 2019 · 8da4a9b · 8da4a9b
2 parents 055cac2 + 8e07348
commit 8da4a9b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Classes/Core/Runtime.php b/Classes/Core/Runtime.php
@@ -426,8 +426,10 @@ protected function evaluateInternal($fusionPath, $behaviorIfPathNotFound, $conte
         $currentProperties = $this->getCurrentApplyValues();
         if (is_array($currentProperties) && array_key_exists($fusionPath, $currentProperties)) {
             if ($this->evaluateIfCondition($fusionConfiguration, $fusionPath, $contextObject) === false) {
+                $this->finalizePathEvaluation($cacheContext);
                 return null;
             }
+            $this->finalizePathEvaluation($cacheContext);
             return $this->evaluateProcessors($currentProperties[$fusionPath]['value'], $fusionConfiguration, $fusionPath, $contextObject);
         }