Merge branch '5.x' into 5.10

Author: brandonkelly

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - Fixed a bug where entries weren’t redirecting back to their section’s page’s URL by default.
 - Fixed a bug where the `resourceBasePath` and `resourceBaseUrl` config settings weren’t being respected for console requests. ([#18685](https://github.com/craftcms/cms/issues/18685))
+- Fixed a bug where eager-loadable GraphQL fields could be populated with the wrong field’s results, if they followed a fragment with a `*Interface` type condition. ([#18708](https://github.com/craftcms/cms/issues/18708))
+- Fixed a bug where users with permission to edit entries, but not view peer entries in a section, weren’t allowed to edit the authors for entries in the section. ([#18717](https://github.com/craftcms/cms/pull/18717))
 
 ## 5.9.20 - 2026-04-14
 

src/elements/Entry.php

@@ -2493,7 +2493,7 @@ protected function inlineAttributeInputHtml(string $attribute): string
                     ],
                     'single' => false,
                     'elements' => $authors ?: null,
-                    'disabled' => false,
+                    'disabled' => !$this->canChangeAuthor(),
                     'errors' => $this->getErrors('authorIds'),
                     'limit' => $section->maxAuthors,
                 ]);
@@ -2805,10 +2805,6 @@ private function canChangeAuthor(?User $user = null): bool
 
         $section = $this->getSection();
 
-        if (!$user->can("viewPeerEntries:$section->uid")) {
-            return false;
-        }
-
         $authorIds = $this->getAuthorIds();
 
         return (

src/gql/ElementQueryConditionBuilder.php

@@ -548,17 +548,13 @@ private function _traverseAndBuildPlans(Node $parentNode, EagerLoadPlan $parentP
                     $subNode = $this->_fragments[$nodeName];
                 }
 
-                $wrappingFragment = $subNode;
-
-                $nodeName = $subNode->typeCondition->name->value;
-
                 // If we are inside a field that supports different subtypes, it should implement the appropriate interface
                 if ($parentField instanceof GqlInlineFragmentFieldInterface) {
                     // Get the Craft entity that correlates to the fragment
                     // Build the prefix, load the context and proceed in a recursive manner
                     try {
-                        $gqlFragmentEntity = $parentField->getGqlFragmentEntityByName($nodeName);
-                        $plan->nested = $this->_traverseAndBuildPlans($subNode, $plan, $parentField, $wrappingFragment, $gqlFragmentEntity->getFieldContext());
+                        $gqlFragmentEntity = $parentField->getGqlFragmentEntityByName($subNode->typeCondition->name->value);
+                        $plan->nested = $this->_traverseAndBuildPlans($subNode, $plan, $parentField, $subNode, $gqlFragmentEntity->getFieldContext());
 
                         // Correct the handles and, maybe, aliases.
                         foreach ($plan->nested as $nestedPlan) {
@@ -570,11 +566,11 @@ private function _traverseAndBuildPlans(Node $parentNode, EagerLoadPlan $parentP
                         }
                         // This is to be expected, depending on whether the fragment is targeted towards the field itself instead of its subtypes.
                     } catch (InvalidArgumentException) {
-                        $plan->nested = $this->_traverseAndBuildPlans($subNode, $plan, $parentField, $wrappingFragment, $context);
+                        $plan->nested = $this->_traverseAndBuildPlans($subNode, $plan, $parentField, $subNode, $context);
                     }
                     // If we are not, just expand the fragment and traverse it as if on the same level in the query tree
                 } else {
-                    $plan->nested = $this->_traverseAndBuildPlans($subNode, $plan, $parentField, $wrappingFragment, $context);
+                    $plan->nested = $this->_traverseAndBuildPlans($subNode, $plan, $parentField, $subNode, $context);
                 }
             }