Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 6 additions & 22 deletions src/admin/class-event-dates.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ public function cron_weekly() {
foreach ( $post_ids as $post_id ) {
$this->save_handler( $post_id );
}

// Clear the wp-rest-cache.
if ( class_exists( \Caching::class ) ) {
\Caching::get_instance()->delete_cache_by_endpoint( '%/openagenda/v1/items', \Caching::FLUSH_LOOSE, true );
}
}

/**
Expand Down Expand Up @@ -126,22 +121,6 @@ public function save_handler( $post_id ) {
if ( wp_is_post_autosave( $post_id ) ) {
return;
}
if ( doing_action( 'save_post_event' ) ) {
// We cannot do this now. The post we are trying to update doesn't exist yet.
add_action(
'shutdown',
function () use ( $post_id ) {
// Do the save-actions.
$this->save_handler( $post_id );
// And clear the wp-rest-cache.
if ( class_exists( \Caching::class ) ) {
\Caching::get_instance()->delete_cache_by_endpoint( '%/openagenda/v1/items', \Caching::FLUSH_LOOSE, true );
}
}
);

return;
}

// Check the dates types value and make sure only the fields of the selected group is saved.
$dates_type = get_post_meta( $post_id, 'event_dates_type', true );
Expand Down Expand Up @@ -838,6 +817,11 @@ public function date_string( $post_id, $long_format = true, $short_format_for_th
foreach ( $event_dates as $meta ) {
++$string_index;

// Check if meta is an array.
if ( empty( $meta ) || ! is_array( $meta ) ) {
continue;
}

$type = $dates_type;
$meta['repeat_days'] = isset( $meta[ $prefix . 'complex_weekdays' ] ) ? $meta[ $prefix . 'complex_weekdays' ] : array();
if ( empty( $meta['repeat_days'] ) ) {
Expand All @@ -852,7 +836,7 @@ public function date_string( $post_id, $long_format = true, $short_format_for_th
// If it is every monday of every month, then it's just every monday.
$month_suffix = trim( $number_insert ) ? _x( 'of the month', 'of the month as in Every last friday of the month', 'openagenda-base' ) : '';

if ( ( $meta[ $prefix . 'complex_months' ] ) && count( $meta[ $prefix . 'complex_months' ] ) > 0 ) {
if ( isset( $meta[ $prefix . 'complex_months' ] ) && is_array( $meta[ $prefix . 'complex_months' ] ) && count( $meta[ $prefix . 'complex_months' ] ) > 0 ) {
$month_suffix = _x( 'of', 'of as in Every last friday of January', 'openagenda-base' ) . ' ' . $this->nice_concat( $this->translate_months( $meta[ $prefix . 'complex_months' ] ) );

if ( ! $long_format ) { // only list "current month".
Expand Down