Fixes multisite propagating to sites outside group

octobercms · May 10, 2024 · 098a219 · 098a219
1 parent ccb93de
commit 098a219
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Database/Traits/Multisite.php b/src/Database/Traits/Multisite.php
@@ -90,18 +90,20 @@ public function multisiteSaveComplete()
 
         Site::withGlobalContext(function() {
             $otherModels = $this->newOtherSiteQuery()->get();
-            $otherSites = $otherModels->pluck('site_id')->all();
+            $otherSites = $this->getMultisiteSyncSites();
 
             // Propagate attributes to known records
             if ($this->propagatable) {
-                foreach ($otherModels as $model) {
-                    $this->propagateToSite($model->site_id, $model);
+                foreach ($otherSites as $siteId) {
+                    if ($model = $otherModels->where('site_id', $siteId)->first()) {
+                        $this->propagateToSite($siteId, $model);
+                    }
                 }
             }
 
             // Sync non-existent records
             if ($this->isMultisiteSyncEnabled()) {
-                $missingSites = array_diff($this->getMultisiteSyncSites(), $otherSites);
+                $missingSites = array_diff($otherSites, $otherModels->pluck('site_id')->all());
                 foreach ($missingSites as $missingSite) {
                     $this->propagateToSite($missingSite);
                 }