[5.x] Fixed ordering search results by origin value (#11334)

statamic · Jan 22, 2025 · 6a3bcde · 6a3bcde
1 parent b07b70b
commit 6a3bcde
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Data/DataCollection.php b/src/Data/DataCollection.php
@@ -96,17 +96,19 @@ protected function getSortableValue($sort, $item)
             return $this->normalizeSortableValue($item[$sort] ?? null);
         }
 
-        $method = Str::camel($sort);
-
         if ($item instanceof Result && ! $item instanceof PlainResult) {
             $item = $item->getSearchable() ?? $item;
         }
 
-        $value = (method_exists($item, $method))
-            ? call_user_func([$item, $method])
-            : $item->get($sort);
+        if (method_exists($item, $method = Str::camel($sort))) {
+            return $this->normalizeSortableValue(call_user_func([$item, $method]));
+        }
+
+        if (method_exists($item, 'value')) {
+            return $this->normalizeSortableValue($item->value($sort));
+        }
 
-        return $this->normalizeSortableValue($value);
+        return $this->normalizeSortableValue($item->get($sort));
     }
 
     /**