Changeset 3757553

Timestamp:

10/20/2026 11:15:19 PM (2 weeks ago)

Author:

beaconevents

Message:

Release 0.28.3

Location:

beacon-events

Files:

• tags/0.28.3 (copied) (copied from beacon-events/trunk )
• tags/0.28.3/beacon-events.php (modified) (2 diffs)
• tags/0.28.3/includes/class-views.php (modified) (1 diff)
• tags/0.28.3/readme.txt (modified) (2 diffs)
• trunk/beacon-events.php (modified) (2 diffs)
• trunk/includes/class-views.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

beacon-events/tags/0.28.3/beacon-events.php

@@ -4 +4 @@
  * Plugin URI:        https://wordpress.org/plugins/beacon-events/
  * Description:       A light, honest events calendar. Recurring events, ICS and Google Calendar import that stays in sync, and calendar views that look like your site — all free. Uninstalls clean.
- * Version:           0.28.2
+ * Version:           0.28.3
  * Requires at least: 6.4
  * Requires PHP:      7.4
@@ -15 +15 @@
         exit; }
 
-define( 'BEACON_VERSION', '0.28.2' );
+define( 'BEACON_VERSION', '0.28.3' );
 define( 'BEACON_FILE', __FILE__ );
 define( 'BEACON_DIR', plugin_dir_path( __FILE__ ) );

beacon-events/tags/0.28.3/includes/class-views.php

@@ -1024 +1024 @@
                 } catch ( \Exception $x ) {
                         $tz = self::tz(); }
-                $s    = new \DateTimeImmutable( $e['start'], $tz );
-                $en   = $e['end'] ? new \DateTimeImmutable( $e['end'], $tz ) : null;
+                $s  = new \DateTimeImmutable( $e['start'], $tz );
+                $en = $e['end'] ? new \DateTimeImmutable( $e['end'], $tz ) : null;
+                if ( $e['rrule'] ) {
+                        // A series shows its next date (someone looking in October wants the next class, not September's first one);
+                        // the Repeats row says how it goes on. A finished series keeps its first date.
+                        try {
+                                $otz = new \DateTimeZone( $e['tz'] );
+                        } catch ( \Exception $x ) {
+                                $otz = new \DateTimeZone( 'UTC' ); }
+                        foreach ( Events::occurrences_for_edit( $id, 20 ) as $o ) {
+                                if ( $o['status'] !== 'cancelled' ) {
+                                        $s  = ( new \DateTimeImmutable( $o['start'], $otz ) )->setTimezone( $tz );
+                                        $en = $en ? ( new \DateTimeImmutable( $o['end'], $otz ) )->setTimezone( $tz ) : null;
+                                        break; }
+                        }
+                }
                 $when = $e['all_day'] ? wp_date( get_option( 'date_format' ), $s->getTimestamp(), $tz ) . ( $en && $en->format( 'Y-m-d' ) !== $s->format( 'Y-m-d' ) ? ' – ' . wp_date( get_option( 'date_format' ), $en->getTimestamp(), $tz ) : '' ) : wp_date( get_option( 'date_format' ) . ', ' . get_option( 'time_format' ), $s->getTimestamp(), $tz ) . ( $en ? ' – ' . wp_date( $en->format( 'Y-m-d' ) === $s->format( 'Y-m-d' ) ? get_option( 'time_format' ) : get_option( 'date_format' ) . ', ' . get_option( 'time_format' ), $en->getTimestamp(), $tz ) : '' ) . self::zone_label( $s );
                 $rows = '<div class="beacon-detail"><span class="beacon-detail-label">' . esc_html__( 'When', 'beacon-events' ) . '</span> <span class="beacon-detail-value">' . esc_html( $when ) . '</span></div>';

beacon-events/tags/0.28.3/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 0.28.2
+Stable tag: 0.28.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -204 +204 @@
 == Changelog ==
 
+= 0.28.3 =
+* A repeating event's page now shows its next date under "When", not the date the series began. A weekly class that started in September shows next week's class, skipping cancelled dates and following moved ones. A finished series still shows its first date.
+
 = 0.28.2 =
 * Pro can now be paid monthly ($7 a month for one site), as well as yearly. The Pro page and the import screen say so.

beacon-events/trunk/beacon-events.php

@@ -4 +4 @@
  * Plugin URI:        https://wordpress.org/plugins/beacon-events/
  * Description:       A light, honest events calendar. Recurring events, ICS and Google Calendar import that stays in sync, and calendar views that look like your site — all free. Uninstalls clean.
- * Version:           0.28.2
+ * Version:           0.28.3
  * Requires at least: 6.4
  * Requires PHP:      7.4
@@ -15 +15 @@
         exit; }
 
-define( 'BEACON_VERSION', '0.28.2' );
+define( 'BEACON_VERSION', '0.28.3' );
 define( 'BEACON_FILE', __FILE__ );
 define( 'BEACON_DIR', plugin_dir_path( __FILE__ ) );

beacon-events/trunk/includes/class-views.php

@@ -1024 +1024 @@
                 } catch ( \Exception $x ) {
                         $tz = self::tz(); }
-                $s    = new \DateTimeImmutable( $e['start'], $tz );
-                $en   = $e['end'] ? new \DateTimeImmutable( $e['end'], $tz ) : null;
+                $s  = new \DateTimeImmutable( $e['start'], $tz );
+                $en = $e['end'] ? new \DateTimeImmutable( $e['end'], $tz ) : null;
+                if ( $e['rrule'] ) {
+                        // A series shows its next date (someone looking in October wants the next class, not September's first one);
+                        // the Repeats row says how it goes on. A finished series keeps its first date.
+                        try {
+                                $otz = new \DateTimeZone( $e['tz'] );
+                        } catch ( \Exception $x ) {
+                                $otz = new \DateTimeZone( 'UTC' ); }
+                        foreach ( Events::occurrences_for_edit( $id, 20 ) as $o ) {
+                                if ( $o['status'] !== 'cancelled' ) {
+                                        $s  = ( new \DateTimeImmutable( $o['start'], $otz ) )->setTimezone( $tz );
+                                        $en = $en ? ( new \DateTimeImmutable( $o['end'], $otz ) )->setTimezone( $tz ) : null;
+                                        break; }
+                        }
+                }
                 $when = $e['all_day'] ? wp_date( get_option( 'date_format' ), $s->getTimestamp(), $tz ) . ( $en && $en->format( 'Y-m-d' ) !== $s->format( 'Y-m-d' ) ? ' – ' . wp_date( get_option( 'date_format' ), $en->getTimestamp(), $tz ) : '' ) : wp_date( get_option( 'date_format' ) . ', ' . get_option( 'time_format' ), $s->getTimestamp(), $tz ) . ( $en ? ' – ' . wp_date( $en->format( 'Y-m-d' ) === $s->format( 'Y-m-d' ) ? get_option( 'time_format' ) : get_option( 'date_format' ) . ', ' . get_option( 'time_format' ), $en->getTimestamp(), $tz ) : '' ) . self::zone_label( $s );
                 $rows = '<div class="beacon-detail"><span class="beacon-detail-label">' . esc_html__( 'When', 'beacon-events' ) . '</span> <span class="beacon-detail-value">' . esc_html( $when ) . '</span></div>';

beacon-events/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 0.28.2
+Stable tag: 0.28.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -204 +204 @@
 == Changelog ==
 
+= 0.28.3 =
+* A repeating event's page now shows its next date under "When", not the date the series began. A weekly class that started in September shows next week's class, skipping cancelled dates and following moved ones. A finished series still shows its first date.
+
 = 0.28.2 =
 * Pro can now be paid monthly ($7 a month for one site), as well as yearly. The Pro page and the import screen say so.