$isNewSite

Better fix for #16752
craftcms · Feb 25, 2025 · 7ce8b10 · 7ce8b10
1 parent 68bb559
commit 7ce8b10
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/src/base/Element.php b/src/base/Element.php
@@ -2322,6 +2322,8 @@ public function attributes(): array
             $names['propagating'],
             $names['propagateAll'],
             $names['newSiteIds'],
+            $names['isNewForSite'],
+            $names['isNewSite'],
             $names['resaving'],
             $names['duplicateOf'],
             $names['mergingCanonicalChanges'],

diff --git a/src/base/ElementTrait.php b/src/base/ElementTrait.php
@@ -189,6 +189,12 @@ trait ElementTrait
      */
     public bool $isNewForSite = false;
 
+    /**
+     * @var bool Whether this is for a newly-created site.
+     * @since 4.14.9
+     */
+    public bool $isNewSite = false;
+
     /**
      * @var bool Whether the element is being resaved by a ResaveElement job or a `resave` console command.
      * @since 3.1.22

diff --git a/src/fields/BaseRelationField.php b/src/fields/BaseRelationField.php
@@ -587,6 +587,7 @@ public function normalizeValue(mixed $value, ?ElementInterface $element = null):
             $value instanceof ElementQueryInterface &&
             $element?->propagating &&
             $element->isNewForSite &&
+            !$element->isNewSite &&
             !$this->targetSiteId &&
             !$this->showSiteMenu
         ) {

diff --git a/src/queue/jobs/PropagateElements.php b/src/queue/jobs/PropagateElements.php
@@ -41,6 +41,12 @@ class PropagateElements extends BaseBatchedJob
      */
     public array|int|null $siteId = null;
 
+    /**
+     * @var bool Whether this is for a newly-added site.
+     * @since 4.14.9
+     */
+    public bool $isNewSite = false;
+
     /**
      * @inheritdoc
      */
@@ -81,6 +87,7 @@ protected function processItem(mixed $item): void
         /** @var ElementInterface $item */
         $item->setScenario(Element::SCENARIO_ESSENTIALS);
         $item->newSiteIds = [];
+        $item->isNewSite = $this->isNewSite;
         $supportedSiteIds = array_map(fn($siteInfo) => $siteInfo['siteId'], ElementHelper::supportedSitesForElement($item));
         $elementSiteIds = $this->siteId !== null ? array_intersect($this->siteId, $supportedSiteIds) : $supportedSiteIds;
         $elementsService = Craft::$app->getElements();

diff --git a/src/services/Sites.php b/src/services/Sites.php
@@ -820,10 +820,10 @@ public function handleChangedSite(ConfigEvent $event): void
             // (skip entries because they only support specific sites)
             // (skip Matrix blocks because they will be re-saved when their owners are re-saved).
             $elementTypes = [
+                GlobalSet::class,
                 Asset::class,
                 Category::class,
                 Tag::class,
-                GlobalSet::class,
             ];
 
             foreach ($elementTypes as $elementType) {
@@ -833,6 +833,7 @@ public function handleChangedSite(ConfigEvent $event): void
                         'siteId' => $oldPrimarySiteId,
                     ],
                     'siteId' => $site->id,
+                    'isNewSite' => true,
                 ]));
             }
         }