diff --git a/Classes/ContentObject/Relation.php b/Classes/ContentObject/Relation.php index 0a40b052f..e769d709e 100644 --- a/Classes/ContentObject/Relation.php +++ b/Classes/ContentObject/Relation.php @@ -325,7 +325,12 @@ protected function resolveRelatedValue( string $foreignTableName = '', ): array { if ($this->getLanguageUid($parentContentObject) > 0 && !empty($foreignTableName)) { - $relatedRecord = $this->getFrontendOverlayService($parentContentObject)->getOverlay($foreignTableName, $relatedRecord); + $overlayRelatedRecord = $this->getFrontendOverlayService($parentContentObject)->getOverlay($foreignTableName, $relatedRecord); + // sys_page->getLanguageOverlay() may return NULL if overlays were activated but no overlay + // was found and LanguageAspect was NOT set to MIXED + // + // If so rely on original record data + $relatedRecord = is_array($overlayRelatedRecord) ? $overlayRelatedRecord : $relatedRecord; } $contentObject = clone $parentContentObject;