Changeset 9021

Timestamp:

07/03/2019 10:39:41 AM (5 years ago)

Author:

tellyworth

Message:

Make/meetings: fix sorting of meetings times.

Was broken by r8952.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-meeting-posttype/wporg-meeting-posttype.php

@@ -459 +459 @@
             array(
                 'post_type' => 'meeting',
-                'posts_per_page'  => $attr['limit'],
+                'nopaging'  => true,
                 'meta_query' => array(
                     'relation' => 'AND',
@@ -472 +472 @@
         );
 
+        $limit = $attr['limit'] > 0 ? $attr['limit'] : count( $query->posts );
+
         $out = '';
-        foreach ( $query->posts as $post ) {
+        foreach ( array_slice( $query->posts, 0, $limit ) as $post ) {
             $next_meeting_datestring = $post->next_date;
             $utc_time = strftime( '%H:%M:%S', strtotime( $post->time ) );
@@ -488 +490 @@
             $out .= esc_html( $attr['before'] );
             $out .= '<strong class="meeting-title">' . esc_html( $post->post_title ) . '</strong>';
-            $display_count = $query->found_posts - count($query->posts);
-            if ( $attr['more'] ) {
-                $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_count ) . '</a>';
+            $display_more = $query->found_posts - intval( $limit );
+            if ( $display_more > 0 ) {
+                $out .= $display_count === 0 ? '' : ' <a title="Click to view all meetings for this team" href="/meetings#' . esc_attr( $attr['team'] ) . '">' . sprintf( __( '(+%s more)'), $display_more ) . '</a>';
             }
             $out .= '</br>';