Merge pull request #16162 from craftcms/bugfix/16158-creating-new-nes…

…ted-entry-in-non-primary-site Bugfix/16158 creating new nested entry in non primary site
craftcms · Nov 22, 2024 · 22e4e9c · 22e4e9c
2 parents 2e50e71 + e076949
commit 22e4e9c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Element indexes now sort by ID by default, for sources that don’t define a default sort option.
 - Fixed a bug where element indexes were sorting by the first sortable attribute alphabetically by default, rather than the first sortable attribute defined by the element type.
+- Fixed an error that could occur when creating a nested element. ([#16162](https://github.com/craftcms/cms/pull/16162))
 
 ## 5.5.2 - 2024-11-19
 

diff --git a/src/base/NestedElementTrait.php b/src/base/NestedElementTrait.php
@@ -154,9 +154,8 @@ public function getPrimaryOwner(): ?ElementInterface
                 return null;
             }
 
-            $this->_primaryOwner = Craft::$app->getElements()->getElementById($primaryOwnerId, null, null, [
+            $this->_primaryOwner = Craft::$app->getElements()->getElementById($primaryOwnerId, null, $this->siteId, [
                 'trashed' => null,
-                'preferSites' => [$this->siteId],
             ]) ?? false;
             if (!$this->_primaryOwner) {
                 throw new InvalidConfigException("Invalid owner ID: $primaryOwnerId");

diff --git a/src/helpers/Cp.php b/src/helpers/Cp.php
@@ -44,6 +44,7 @@
 use Illuminate\Support\Collection;
 use yii\base\Event;
 use yii\base\InvalidArgumentException;
+use yii\base\InvalidConfigException;
 use yii\helpers\Markdown;
 use yii\validators\RequiredValidator;
 
@@ -892,6 +893,12 @@ private static function baseElementAttributes(ElementInterface $element, array $
         $user = Craft::$app->getUser()->getIdentity();
         $editable = $user && $elementsService->canView($element, $user);
 
+        $primaryOwner = null;
+        try {
+            $primaryOwner = $element instanceof NestedElementInterface ? $element->getPrimaryOwner() : null;
+        } catch (InvalidConfigException $e) {
+        }
+
         return ArrayHelper::merge(
             Html::normalizeTagAttributes($element->getHtmlAttributes($config['context'])),
             [
@@ -909,7 +916,7 @@ private static function baseElementAttributes(ElementInterface $element, array $
                     'field-id' => $element instanceof NestedElementInterface ? $element->getField()?->id : null,
                     'primary-owner-id' => $element instanceof NestedElementInterface ? $element->getPrimaryOwnerId() : null,
                     'owner-id' => $element instanceof NestedElementInterface ? $element->getOwnerId() : null,
-                    'owner-is-canonical' => $element instanceof NestedElementInterface ? $element->getPrimaryOwner()?->getIsCanonical() : null,
+                    'owner-is-canonical' => $primaryOwner?->getIsCanonical(),
                     'site-id' => $element->siteId,
                     'status' => $element->getStatus(),
                     'label' => (string)$element,