Ticket #41112: 41112.diff

src/wp-admin/includes/class-wp-community-events.php

@@ -416 +416 @@
         }
 
         /**
-         * Discards expired events, and reduces the remaining list.
+         * Trims events list to prepare it for presentation.
          *
+         * Discards expired events, forces first WordCamp to appear first
+         * and reduces the remaining list.
+         *
+         * @access protected
          * @since 4.8.0
          *
          * @param  array $response_body The response body which contains the events.
@@ -427 +431 @@
                 if ( isset( $response_body['events'] ) ) {
                         $current_timestamp = current_time( 'timestamp' );
 
+                        $wordcamps = array();
                         foreach ( $response_body['events'] as $key => $event ) {
+                                if ( empty( $wordcamps ) ) {
+                                        if ( 'wordcamp' === $event['type'] ) {
+                                                array_push( $wordcamps, $event );
+                                                unset( $response_body['events'][ $key ] );
+                                        }
+                                }
                                 // Skip WordCamps, because they might be multi-day events.
                                 if ( 'meetup' !== $event['type'] ) {
                                         continue;
@@ -440 +451 @@
                                 }
                         }
 
+                        $response_body['events'] = array_merge( $wordcamps, $response_body['events'] );
+
                         $response_body['events'] = array_slice( $response_body['events'], 0, 3 );
                 }