Merge pull request #490 from devgeniem/TMS-1010

TMS-1010: Fix events-lift component sorting with recurring events
devgeniem · Jan 31, 2024 · c5cd0ec · c5cd0ec
2 parents 9287c81 + f247cbd
commit c5cd0ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.54.5] - 2024-02-01
 
 - TMS-977: Add 'clear form' button to event-search
+- TMS-1010: Fix events-lift component sorting with recurring events
 
 ## [1.54.4] - 2024-01-15
 

diff --git a/lib/Formatters/EventzFormatter.php b/lib/Formatters/EventzFormatter.php
@@ -76,14 +76,13 @@ public function format( array $layout ) : array {
             return $layout;
         }
 
-        if ( ! empty( $layout['manual_event_categories'] ) ) {
-            // Sort events by start datetime objects.
-            usort( $events, function( $a, $b ) {
-                return $a['start_date_raw'] <=> $b['start_date_raw'];
-            } );
+        // Sort events by start datetime objects.
+        usort( $events, function( $a, $b ) {
+            return $a['start_date_raw'] <=> $b['start_date_raw'];
+        } );
 
-            $events = array_slice( $events, 0, $layout['page_size'] );
-        }
+        // Show selected amount of events
+        $events = array_slice( $events, 0, $layout['page_size'] );
 
         $layout['events']  = $this->format_events( $events, $layout['show_images'] );
         $layout['classes'] = [