Merge branch 'v4.1.8' into v4.2.0-forms

# Conflicts: # src/core/helpers/ConditionHelper.php
happycog · Mar 7, 2024 · fca1655 · fca1655
2 parents 4205b33 + 631b4db
commit fca1655
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/core/components/elements/conditions/TwigExpressionConditionRule.php b/src/core/components/elements/conditions/TwigExpressionConditionRule.php
@@ -22,7 +22,9 @@ public function getLabel(): string
 
     public function getExclusiveQueryParams(): array
     {
-        return [];
+        return [
+            'twigExpression',
+        ];
     }
 
     public function getConfig(): array

diff --git a/src/core/helpers/ConditionHelper.php b/src/core/helpers/ConditionHelper.php
@@ -10,7 +10,13 @@ class ConditionHelper
 {
     public static function registerConditionRuleTypes(RegisterConditionRuleTypesEvent $event): void
     {
-        if (!$event->sender->elementType === TransactionalEmailElement::class) {
+        $elementType = $event->sender?->elementType;
+
+        if ($elementType === null) {
+            return;
+        }
+
+        if (!is_subclass_of($elementType, Element::class)) {
             return;
         }