Don't set the owner for valueGetter()

fixes scenario 2
craftcms · May 14, 2024 · c12497f · c12497f
1 parent 6a427e0
commit c12497f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Field.php b/src/Field.php
@@ -171,7 +171,7 @@ public static function entryManager(self $field): NestedElementManager
                             return array_map(fn($match) => (int)$match, $matches[1]);
                         }, self::fieldInstances($owner, $field)));
 
-                        $query = self::createEntryQuery($owner, $field)
+                        $query = self::createEntryQuery($owner, $field, false)
                             ->where(['in', 'elements.id', $entryIds])
                             ->trashed(null);
 
@@ -207,7 +207,7 @@ private static function fieldInstances(ElementInterface $element, self $field):
         return array_values(array_filter($customFields, fn(FieldInterface $f) => $f->id === $field->id));
     }
 
-    private static function createEntryQuery(?ElementInterface $owner, self $field): EntryQuery
+    private static function createEntryQuery(?ElementInterface $owner, self $field, bool $setOwner = true): EntryQuery
     {
         $query = Entry::find();
 
@@ -217,8 +217,10 @@ private static function createEntryQuery(?ElementInterface $owner, self $field):
                 ElementQuery::EVENT_BEFORE_PREPARE => function(
                     CancelableEvent $event,
                     EntryQuery $query,
-                ) use ($owner) {
-                    $query->ownerId = $owner->id;
+                ) use ($owner, $setOwner) {
+                    if ($setOwner) {
+                        $query->ownerId = $owner->id;
+                    }
 
                     // Clear out id=false if this query was populated previously
                     if ($query->id === false) {