Changeset 5848

Timestamp:

08/31/2017 12:24:45 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Make/Meetings: Don't skip meetings with a Start Date later on the current week.

Fixes #1657.

File:

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

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

@@ -119 +119 @@
                     // from the start date, advance the week until it's past now
                     $start = new DateTime( $post->start_date.' '.$post->time.' GMT' );
+                    $next = $start;
                     $now = new DateTime();
-                    $interval = $start->diff($now);
-                    // add one to days to account for events that happened earlier today
-                    $weekdiff = ceil( ($interval->days+1) / 7 );
-                    $next = strtotime( "{$post->start_date} + {$weekdiff} weeks" );
-                    $post->next_date = date('Y-m-d', $next);
+                    if ( $now > $next ) {
+                        $interval = $start->diff($now);
+                        // add one to days to account for events that happened earlier today
+                        $weekdiff = ceil( ($interval->days+1) / 7 );
+                        $next->modify('+ '.$weekdiff.' weeks');
+                    }
+                    $post->next_date = $next->format( 'Y-m-d' );
                 } catch (Exception $e) {
                     // if the datetime is invalid, then set the post->next_date to the start date instead