Fixed #12881 part 2

craftcms · Mar 14, 2023 · 3d34607 · 3d34607
1 parent ac5c4bb
commit 3d34607
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/elements/conditions/ElementCondition.php b/src/elements/conditions/ElementCondition.php
@@ -9,6 +9,7 @@
 use craft\elements\db\ElementQueryInterface;
 use craft\errors\InvalidTypeException;
 use craft\fields\conditions\FieldConditionRuleInterface;
+use yii\base\InvalidConfigException;
 
 /**
  * ElementCondition provides an element condition.
@@ -62,6 +63,10 @@ class ElementCondition extends BaseCondition implements ElementConditionInterfac
      */
     public function __construct(?string $elementType = null, array $config = [])
     {
+        if (!class_exists($elementType) || !is_subclass_of($elementType, ElementInterface::class)) {
+            throw new InvalidConfigException("Invalid element type: $elementType");
+        }
+
         $this->elementType = $elementType;
         parent::__construct($config);
     }

diff --git a/src/services/ProjectConfig.php b/src/services/ProjectConfig.php
@@ -1868,7 +1868,7 @@ private function _getElementSourceData(array $sourceConfigs): array
                 if ($config['type'] === ElementSources::TYPE_CUSTOM && isset($config['condition'])) {
                     try {
                         $config['condition'] = $conditionsService->createCondition($config['condition'])->getConfig();
-                    } catch (InvalidArgumentException) {
+                    } catch (InvalidArgumentException|InvalidConfigException) {
                         // Ignore it
                     }
                 }