Make element select condition rules site-agnostic

brandonkelly · brandonkelly · commit 233d23c54227 · 2024-11-06T10:52:48.000-08:00
Resolves #16005
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where entry/category drafts weren’t retaining new parent selections.
+- Fixed a bug where the “Related to” condition rule would lose track of the selected element if it belonged to a different site. ([#16005](https://github.com/craftcms/cms/pull/16005))
 - Fixed styling issues. ([#15965](https://github.com/craftcms/cms/issues/15965))
 
 ## 4.12.8 - 2024-10-22
diff --git a/src/base/conditions/BaseElementSelectConditionRule.php b/src/base/conditions/BaseElementSelectConditionRule.php
@@ -152,6 +152,9 @@ private function _element(): ?ElementInterface
         /** @phpstan-var class-string<ElementInterface>|ElementInterface $elementType */
         $elementType = $this->elementType();
         return $elementType::find()
+            ->site('*')
+            ->preferSites(array_filter([Cp::requestedSite()?->id]))
+            ->unique()
             ->id($elementId)
             ->status(null)
             ->one();
