Entries should use their origin's value in search indexes where appro…

…priate. Closes #2789
statamic · Nov 5, 2020 · 88b245b · 88b245b
1 parent a0c7ad9
commit 88b245b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Search/Searchables.php b/src/Search/Searchables.php
@@ -159,7 +159,11 @@ public function fields($searchable): array
         $transformers = $this->index->config()['transformers'] ?? [];
 
         return collect($fields)->mapWithKeys(function ($field) use ($searchable) {
-            $value = method_exists($searchable, $field) ? $searchable->{$field}() : $searchable->get($field);
+            if (method_exists($searchable, $field)) {
+                $value = $searchable->{$field}();
+            } else {
+                $value = $searchable instanceof EntryContract ? $searchable->value($field) : $searchable->get($field);
+            }
 
             return [$field => $value];
         })->flatMap(function ($value, $field) use ($transformers) {