Source locale lookup correction.

silverstripe · Jul 9, 2020 · cfc1925 · cfc1925
1 parent 79c248b
commit cfc1925
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Model/RecordLocale.php b/src/Model/RecordLocale.php
@@ -351,14 +351,20 @@ public function getSourceLocale(): ?Locale
     {
         /** @var DataObject|FluentExtension $record */
         $record = $this->getOriginalRecord();
+        $validationMethod = 'existsInLocale';
 
-        if ($record->existsInLocale($this->getLocale())) {
+        if ($record->hasExtension(FluentVersionedExtension::class)) {
+            $stage = Versioned::get_stage() ?: Versioned::DRAFT;
+            $validationMethod = $stage === Versioned::DRAFT ? 'isDraftedInLocale' : 'isPublishedInLocale';
+        }
+
+        if ($record->{$validationMethod}($this->getLocale())) {
             return $this->getLocaleObject();
         }
 
         /** @var Locale $fallback */
         foreach ($this->getLocaleObject()->Fallbacks() as $fallback) {
-            if (!$record->existsInLocale($fallback->Locale)) {
+            if (!$record->{$validationMethod}($fallback->Locale)) {
                 continue;
             }