Use consistent event args; convert to new sort config first (fix #1994)

omeka · Jan 30, 2023 · f5da39a · f5da39a
1 parent 065285d
commit f5da39a
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/application/src/View/Helper/SortSelector.php b/application/src/View/Helper/SortSelector.php
@@ -22,6 +22,12 @@ class SortSelector extends AbstractHelper
      */
     public function __invoke($sortBy, $partialName = null)
     {
+        // Convert to the new sort configuration structure.
+        $sortConfig = [];
+        foreach ($sortBy as $sortByOption) {
+            $sortConfig[$sortByOption['value']] = $sortByOption['label'];
+        }
+
         $partialName = $partialName ?: self::PARTIAL_NAME;
 
         $view = $this->getView();
@@ -30,19 +36,12 @@ public function __invoke($sortBy, $partialName = null)
         $sortOrderQuery = $params->fromQuery('sort_order');
 
         $args = [
-            'sortBy' => $sortBy,
+            'sortConfig' => $sortConfig,
             'sortByQuery' => $sortByQuery,
             'sortOrderQuery' => $sortOrderQuery,
         ];
         $args = $view->trigger('view.sort-selector', $args, true);
 
-        // Convert to the new sort configuration structure.
-        $sortConfig = [];
-        foreach ($args['sortBy'] as $sortBy) {
-            $sortConfig[$sortBy['value']] = $sortBy['label'];
-        }
-        $args['sortConfig'] = $sortConfig;
-
         return $view->partial($partialName, (array) $args);
     }
 }