Merge pull request #55 from bookwyrm/fix-column-mismatch-broken-sort

Fix column mismatch broken sort
jjgrainger · Apr 12, 2020 · 627a236 · 627a236
2 parents cb1bb46 + e3d8720
commit 627a236
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/src/Columns.php b/src/Columns.php
@@ -146,6 +146,50 @@ public function sortable($sortable)
         return $this;
     }
 
+    /**
+     * Check if an orderby field is a custom sort option.
+     * @param  string  $orderby  the orderby value from query params
+     */
+    public function isSortable($orderby)
+    {
+        if (array_key_exists($orderby, $this->sortable)) {
+            return true;
+        }
+
+        foreach ($this->sortable as $column => $options) {
+            if (is_string($options) && $options === $orderby) {
+                return true;
+            }
+            if (is_array($options) && isset($options[0]) && $options[0] === $orderby) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get meta key for an orderby.
+     * @param  string  $orderby  the orderby value from query params
+     */
+    public function sortableMeta($orderby)
+    {
+        if (array_key_exists($orderby, $this->sortable)) {
+            return $this->sortable[$orderby];
+        }
+
+        foreach ($this->sortable as $column => $options) {
+            if (is_string($options) && $options === $orderby) {
+                return $options;
+            }
+            if (is_array($options) && isset($options[0]) && $options[0] === $orderby) {
+                return $options;
+            }
+        }
+
+        return '';
+    }
+
     /**
      * Modify the columns for the object
      * @param  array  $columns WordPress default columns

diff --git a/src/PostType.php b/src/PostType.php
@@ -496,9 +496,9 @@ public function sortSortableColumns($query)
         $orderby = $query->get('orderby');
 
         // if the sorting a custom column
-        if (array_key_exists($orderby, $this->columns()->sortable)) {
+        if ($this->columns()->isSortable($orderby)) {
             // get the custom column options
-            $meta = $this->columns()->sortable[$orderby];
+            $meta = $this->columns()->sortableMeta($orderby);
 
             // determine type of ordering
             if (is_string($meta)) {