Respect non-translatable fields in multisite events

solspace · Jun 28, 2022 · f79b13f · f79b13f
1 parent 1f0c607
commit f79b13f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/plugin/src/Services/EventsService.php b/packages/plugin/src/Services/EventsService.php
@@ -494,7 +494,13 @@ private function _respectNonTranslatableFields(Event $event, bool $isSaved) {
 		    $otherSiteIds = ArrayHelper::withoutValue(array_keys($supportedSites), $event->siteId);
 
 		    if (! empty($otherSiteIds)) {
-			    $otherSiteEvents = Event::find()->id($event->id)->siteId($otherSiteIds)->status(null)->all();
+		        foreach ($otherSiteIds as $otherSiteId) {
+			        $otherSiteEvent = $this->getEventById($event->id, $otherSiteId);
+
+			        if ($otherSiteEvent) {
+				        $otherSiteEvents[] = $otherSiteEvent;
+			        }
+		        }
 		    }
 
 		    foreach ($event->getFieldLayout()->getTabs() as $fieldLayoutTab) {