Plugin Directory

Changeset 3746726


Ignore:
Timestamp:
10/14/2026 03:41:08 PM (10 days ago)
Author:
stiofansisland
Message:

Update to version 2.3.34 from GitHub

Location:
events-for-geodirectory
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • events-for-geodirectory/tags/2.3.34/events-for-geodirectory.php

    r3732840 r3746726  
    1212 * Plugin URI:        https://wpgeodirectory.com/downloads/events/
    1313 * Description:       Events add-on allows to extend your GeoDirectory with a versatile event manager.
    14  * Version:           2.3.33
     14 * Version:           2.3.34
    1515 * Requires at least: 6.0
    1616 * Requires PHP:      7.2
    … …  
    3030
    3131if ( ! defined( 'GEODIR_EVENT_VERSION' ) ) {
    32         define( 'GEODIR_EVENT_VERSION', '2.3.33' );
     32        define( 'GEODIR_EVENT_VERSION', '2.3.34' );
    3333}
    3434
  • events-for-geodirectory/tags/2.3.34/includes/template-functions.php

    r3732840 r3746726  
    406406}
    407407
    408 // add date to title for recurring event
     408/**
     409 * Appends the event date to the title of a recurring event.
     410 *
     411 * @global WP_Post $post    The current post object.
     412 * @global object  $gd_post The current GeoDirectory post object.
     413 *
     414 * @param string   $title   The post title.
     415 * @param int|null $post_id Optional. The ID of the post the title belongs to. Default null.
     416 * @return string The post title, with the event date appended when applicable.
     417 */
    409418function geodir_event_title_recurring_event( $title, $post_id = null ) {
    410419        global $post, $gd_post;
    411420
    412     $post_type = ! empty( $post->post_type ) ? $post->post_type : '';
    413     if ( ! GeoDir_Post_types::supports( $post_type, 'events' ) ) {
     421        if ( empty( $post_id ) ) {
    414422                return $title;
    415423        }
    … …  
    421429        }
    422430
     431        // Only the title of the current event post gets a date.
     432        if ( empty( $event_post->ID ) || (int) $event_post->ID !== (int) $post_id ) {
     433                return $title;
     434        }
     435
     436        if ( empty( $event_post->recurring ) || ! GeoDir_Post_types::supports( get_post_type( $post_id ), 'events' ) ) {
     437                return $title;
     438        }
     439
    423440        $remove_date = geodir_get_option( 'event_remove_title_date' ) ? true : false;
    424441
    425442        /**
    426          * Remove date form recurring event schedule title.
     443         * Remove date from recurring event schedule title.
    427444         *
    428445         * @since 2.1.1.8
    429446         *
    430          * @param bool $remove_date True to remove date from title.
    431          * @param object $event_post Event post object.
     447         * @param bool   $remove_date True to remove date from title.
     448         * @param object $event_post  Event post object.
    432449         */
    433450        $remove_date = apply_filters( 'geodir_event_remove_title_recurring_date', $remove_date, $event_post );
    434451
    435         if ( $remove_date ) {
     452        if ( $remove_date || ! geodir_event_recurring_pkg( $event_post ) ) {
    436453                return $title;
    437454        }
    438455
    439         // Check recurring enabled
    440         $recurring_pkg = geodir_event_recurring_pkg( $event_post );
    441         if ( ! $recurring_pkg ) {
    442                 return $title;
    443         }
    444 
    445         if ( isset($event_post->ID ) && $event_post->ID == $post_id && !empty( $event_post->recurring ) ) {
    446                 $geodir_date_format = geodir_event_date_format();
    447                 $current_date = date_i18n( 'Y-m-d', current_time( 'timestamp' ));
    448                 $current_time = strtotime( $current_date );
    449                
    450                 if ( !empty( $event_post->start_date ) && geodir_event_is_date( $event_post->start_date ) ) {
    451                         $event_start_time = strtotime( date_i18n( 'Y-m-d', strtotime( $event_post->start_date ) ) );
    452                         $event_end_time = isset( $event_post->end_date ) && geodir_event_is_date( $event_post->end_date ) ? strtotime( $event_post->end_date ) : 0;
    453                        
    454                         if ($event_end_time > $event_start_time && $event_start_time <= $current_time && $event_end_time >= $current_time) {
    455                                 $title .= "<span class='gd-date-in-title'> " . wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, $current_time ) ) . "</span>";
    456                         } else {
    457                                 $title .= "<span class='gd-date-in-title'> " . wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, strtotime( $event_post->start_date ) ) ) . "</span>";
    458                         }
     456        $geodir_date_format = geodir_event_date_format();
     457        $current_time       = strtotime( current_time( 'Y-m-d' ) );
     458        $event_start_time   = 0;
     459        $event_end_time     = 0;
     460        $event_date_title   = '';
     461
     462        if ( ! empty( $event_post->start_date ) && geodir_event_is_date( $event_post->start_date ) ) {
     463                $event_start_time = strtotime( date_i18n( 'Y-m-d', strtotime( $event_post->start_date ) ) );
     464                $event_end_time   = isset( $event_post->end_date ) && geodir_event_is_date( $event_post->end_date ) ? strtotime( date_i18n( 'Y-m-d', strtotime( $event_post->end_date ) ) ) : 0;
     465
     466                // Multi-day occurrence running today shows today's date, otherwise the start date.
     467                if ( $event_end_time > $event_start_time && $event_start_time <= $current_time && $event_end_time >= $current_time ) {
     468                        $date_time = $current_time;
    459469                } else {
    460                         $gde = geodir_event_get_gde();
    461 
    462                         if ( is_single() && $gde !== '' && GeoDir_Event_Schedules::has_schedule( $post_id, $gde ) ) {
    463                                 $title .= "<span class='gd-date-in-title'> " . wp_sprintf( __( '- %s', 'geodirevents' ), esc_html( date_i18n( $geodir_date_format, strtotime( $gde ) ) ) ) . "</span>";
    464                         }
    465                 }
    466         }
     470                        $date_time = $event_start_time;
     471                }
     472
     473                $event_date_title = wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, $date_time ) );
     474        } else {
     475                $gde = geodir_event_get_gde();
     476
     477                if ( is_single() && '' !== $gde && GeoDir_Event_Schedules::has_schedule( $post_id, $gde ) ) {
     478                        $event_start_time = strtotime( $gde );
     479                        $event_date_title = wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, $event_start_time ) );
     480                }
     481        }
     482
     483        if ( $event_date_title ) {
     484                $event_date_title = ' ' . esc_html( $event_date_title );
     485
     486                /**
     487                 * Filter event date displayed in event title.
     488                 *
     489                 * The returned value is appended to the post title and may contain HTML.
     490                 *
     491                 * @since 2.3.34
     492                 *
     493                 * @param string $event_date_title The event date, with a leading space.
     494                 * @param object $event_post       The event post object.
     495                 * @param int    $event_start_time Event start timestamp.
     496                 * @param int    $event_end_time   Event end timestamp.
     497                 */
     498                $event_date_title = apply_filters( 'geodir_event_date_in_title', $event_date_title, $event_post, $event_start_time, $event_end_time );
     499
     500                $title .= $event_date_title;
     501        }
     502
    467503        return $title;
    468504}
  • events-for-geodirectory/tags/2.3.34/languages/geodirevents-en_US.po

    r3732840 r3746726  
    11msgid ""
    22msgstr ""
    3 "Project-Id-Version: Events for GeoDirectory 2.3.33\n"
     3"Project-Id-Version: Events for GeoDirectory 2.3.34\n"
    44"Report-Msgid-Bugs-To: \n"
    5 "POT-Creation-Date: 2026-10-07 19:07+0530\n"
    6 "PO-Revision-Date: 2026-10-07 19:07+0530\n"
     5"POT-Creation-Date: 2026-10-14 20:17+0530\n"
     6"PO-Revision-Date: 2026-10-14 20:17+0530\n"
    77"Last-Translator: \n"
    88"Language-Team: AyeCode Ltd <contact@ayecode.io>\n"
    … …  
    2121"X-Poedit-SearchPath-0: .\n"
    2222
    23 #: includes/admin/admin-functions.php:87 includes/template-functions.php:613
     23#: includes/admin/admin-functions.php:87 includes/template-functions.php:649
    2424msgid "Event Date"
    2525msgstr ""
    … …  
    9696
    9797#: includes/admin/dummy-data/standard_events.php:86
    98 #: includes/template-functions.php:623
     98#: includes/template-functions.php:659
    9999msgid "Newest"
    100100msgstr ""
    101101
    102102#: includes/admin/dummy-data/standard_events.php:98
    103 #: includes/template-functions.php:633
     103#: includes/template-functions.php:669
    104104msgid "Title"
    105105msgstr ""
    106106
    107107#: includes/admin/dummy-data/standard_events.php:110
    108 #: includes/template-functions.php:643
     108#: includes/template-functions.php:679
    109109msgid "Rating"
    110110msgstr ""
    … …  
    20772077msgstr ""
    20782078
    2079 #: includes/template-functions.php:455 includes/template-functions.php:457
    2080 #: includes/template-functions.php:463
     2079#: includes/template-functions.php:473 includes/template-functions.php:479
    20812080#, php-format
    20822081msgid "- %s"
  • events-for-geodirectory/tags/2.3.34/languages/geodirevents-en_US.pot

    r3732840 r3746726  
    22msgid ""
    33msgstr ""
    4 "Project-Id-Version: Events for GeoDirectory 2.3.33\n"
     4"Project-Id-Version: Events for GeoDirectory 2.3.34\n"
    55"Report-Msgid-Bugs-To: \n"
    6 "POT-Creation-Date: 2026-10-07 19:07+0530\n"
     6"POT-Creation-Date: 2026-10-14 20:16+0530\n"
    77"PO-Revision-Date: 2025-08-07 12:29+0530\n"
    88"Last-Translator: AyeCode Ltd <contact@ayecode.io>\n"
    … …  
    2222"X-Poedit-SearchPath-0: .\n"
    2323
    24 #: includes/admin/admin-functions.php:87 includes/template-functions.php:613
     24#: includes/admin/admin-functions.php:87 includes/template-functions.php:649
    2525msgid "Event Date"
    2626msgstr ""
    … …  
    9797
    9898#: includes/admin/dummy-data/standard_events.php:86
    99 #: includes/template-functions.php:623
     99#: includes/template-functions.php:659
    100100msgid "Newest"
    101101msgstr ""
    102102
    103103#: includes/admin/dummy-data/standard_events.php:98
    104 #: includes/template-functions.php:633
     104#: includes/template-functions.php:669
    105105msgid "Title"
    106106msgstr ""
    107107
    108108#: includes/admin/dummy-data/standard_events.php:110
    109 #: includes/template-functions.php:643
     109#: includes/template-functions.php:679
    110110msgid "Rating"
    111111msgstr ""
    … …  
    20792079msgstr ""
    20802080
    2081 #: includes/template-functions.php:455 includes/template-functions.php:457
    2082 #: includes/template-functions.php:463
     2081#: includes/template-functions.php:473 includes/template-functions.php:479
    20832082#, php-format
    20842083msgid "- %s"
  • events-for-geodirectory/tags/2.3.34/readme.txt

    r3732840 r3746726  
    66Tested up to: 7.1
    77Requires PHP: 7.2
    8 Stable tag: 2.3.33
     8Stable tag: 2.3.34
    99License: GPLv3
    1010License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    7474== Changelog ==
    7575
     76= 2.3.34 - 2026-10-14 =
     77* BS > Post Title renders html in event title - FIXED
     78
    7679= 2.3.33 - 2026-10-07 =
    7780* Better sanitation and escaping for event calendar, search and AYI widget - FIXED/SECURITY
  • events-for-geodirectory/trunk/events-for-geodirectory.php

    r3732840 r3746726  
    1212 * Plugin URI:        https://wpgeodirectory.com/downloads/events/
    1313 * Description:       Events add-on allows to extend your GeoDirectory with a versatile event manager.
    14  * Version:           2.3.33
     14 * Version:           2.3.34
    1515 * Requires at least: 6.0
    1616 * Requires PHP:      7.2
    … …  
    3030
    3131if ( ! defined( 'GEODIR_EVENT_VERSION' ) ) {
    32         define( 'GEODIR_EVENT_VERSION', '2.3.33' );
     32        define( 'GEODIR_EVENT_VERSION', '2.3.34' );
    3333}
    3434
  • events-for-geodirectory/trunk/includes/template-functions.php

    r3732840 r3746726  
    406406}
    407407
    408 // add date to title for recurring event
     408/**
     409 * Appends the event date to the title of a recurring event.
     410 *
     411 * @global WP_Post $post    The current post object.
     412 * @global object  $gd_post The current GeoDirectory post object.
     413 *
     414 * @param string   $title   The post title.
     415 * @param int|null $post_id Optional. The ID of the post the title belongs to. Default null.
     416 * @return string The post title, with the event date appended when applicable.
     417 */
    409418function geodir_event_title_recurring_event( $title, $post_id = null ) {
    410419        global $post, $gd_post;
    411420
    412     $post_type = ! empty( $post->post_type ) ? $post->post_type : '';
    413     if ( ! GeoDir_Post_types::supports( $post_type, 'events' ) ) {
     421        if ( empty( $post_id ) ) {
    414422                return $title;
    415423        }
    … …  
    421429        }
    422430
     431        // Only the title of the current event post gets a date.
     432        if ( empty( $event_post->ID ) || (int) $event_post->ID !== (int) $post_id ) {
     433                return $title;
     434        }
     435
     436        if ( empty( $event_post->recurring ) || ! GeoDir_Post_types::supports( get_post_type( $post_id ), 'events' ) ) {
     437                return $title;
     438        }
     439
    423440        $remove_date = geodir_get_option( 'event_remove_title_date' ) ? true : false;
    424441
    425442        /**
    426          * Remove date form recurring event schedule title.
     443         * Remove date from recurring event schedule title.
    427444         *
    428445         * @since 2.1.1.8
    429446         *
    430          * @param bool $remove_date True to remove date from title.
    431          * @param object $event_post Event post object.
     447         * @param bool   $remove_date True to remove date from title.
     448         * @param object $event_post  Event post object.
    432449         */
    433450        $remove_date = apply_filters( 'geodir_event_remove_title_recurring_date', $remove_date, $event_post );
    434451
    435         if ( $remove_date ) {
     452        if ( $remove_date || ! geodir_event_recurring_pkg( $event_post ) ) {
    436453                return $title;
    437454        }
    438455
    439         // Check recurring enabled
    440         $recurring_pkg = geodir_event_recurring_pkg( $event_post );
    441         if ( ! $recurring_pkg ) {
    442                 return $title;
    443         }
    444 
    445         if ( isset($event_post->ID ) && $event_post->ID == $post_id && !empty( $event_post->recurring ) ) {
    446                 $geodir_date_format = geodir_event_date_format();
    447                 $current_date = date_i18n( 'Y-m-d', current_time( 'timestamp' ));
    448                 $current_time = strtotime( $current_date );
    449                
    450                 if ( !empty( $event_post->start_date ) && geodir_event_is_date( $event_post->start_date ) ) {
    451                         $event_start_time = strtotime( date_i18n( 'Y-m-d', strtotime( $event_post->start_date ) ) );
    452                         $event_end_time = isset( $event_post->end_date ) && geodir_event_is_date( $event_post->end_date ) ? strtotime( $event_post->end_date ) : 0;
    453                        
    454                         if ($event_end_time > $event_start_time && $event_start_time <= $current_time && $event_end_time >= $current_time) {
    455                                 $title .= "<span class='gd-date-in-title'> " . wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, $current_time ) ) . "</span>";
    456                         } else {
    457                                 $title .= "<span class='gd-date-in-title'> " . wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, strtotime( $event_post->start_date ) ) ) . "</span>";
    458                         }
     456        $geodir_date_format = geodir_event_date_format();
     457        $current_time       = strtotime( current_time( 'Y-m-d' ) );
     458        $event_start_time   = 0;
     459        $event_end_time     = 0;
     460        $event_date_title   = '';
     461
     462        if ( ! empty( $event_post->start_date ) && geodir_event_is_date( $event_post->start_date ) ) {
     463                $event_start_time = strtotime( date_i18n( 'Y-m-d', strtotime( $event_post->start_date ) ) );
     464                $event_end_time   = isset( $event_post->end_date ) && geodir_event_is_date( $event_post->end_date ) ? strtotime( date_i18n( 'Y-m-d', strtotime( $event_post->end_date ) ) ) : 0;
     465
     466                // Multi-day occurrence running today shows today's date, otherwise the start date.
     467                if ( $event_end_time > $event_start_time && $event_start_time <= $current_time && $event_end_time >= $current_time ) {
     468                        $date_time = $current_time;
    459469                } else {
    460                         $gde = geodir_event_get_gde();
    461 
    462                         if ( is_single() && $gde !== '' && GeoDir_Event_Schedules::has_schedule( $post_id, $gde ) ) {
    463                                 $title .= "<span class='gd-date-in-title'> " . wp_sprintf( __( '- %s', 'geodirevents' ), esc_html( date_i18n( $geodir_date_format, strtotime( $gde ) ) ) ) . "</span>";
    464                         }
    465                 }
    466         }
     470                        $date_time = $event_start_time;
     471                }
     472
     473                $event_date_title = wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, $date_time ) );
     474        } else {
     475                $gde = geodir_event_get_gde();
     476
     477                if ( is_single() && '' !== $gde && GeoDir_Event_Schedules::has_schedule( $post_id, $gde ) ) {
     478                        $event_start_time = strtotime( $gde );
     479                        $event_date_title = wp_sprintf( __( '- %s', 'geodirevents' ), date_i18n( $geodir_date_format, $event_start_time ) );
     480                }
     481        }
     482
     483        if ( $event_date_title ) {
     484                $event_date_title = ' ' . esc_html( $event_date_title );
     485
     486                /**
     487                 * Filter event date displayed in event title.
     488                 *
     489                 * The returned value is appended to the post title and may contain HTML.
     490                 *
     491                 * @since 2.3.34
     492                 *
     493                 * @param string $event_date_title The event date, with a leading space.
     494                 * @param object $event_post       The event post object.
     495                 * @param int    $event_start_time Event start timestamp.
     496                 * @param int    $event_end_time   Event end timestamp.
     497                 */
     498                $event_date_title = apply_filters( 'geodir_event_date_in_title', $event_date_title, $event_post, $event_start_time, $event_end_time );
     499
     500                $title .= $event_date_title;
     501        }
     502
    467503        return $title;
    468504}
  • events-for-geodirectory/trunk/languages/geodirevents-en_US.po

    r3732840 r3746726  
    11msgid ""
    22msgstr ""
    3 "Project-Id-Version: Events for GeoDirectory 2.3.33\n"
     3"Project-Id-Version: Events for GeoDirectory 2.3.34\n"
    44"Report-Msgid-Bugs-To: \n"
    5 "POT-Creation-Date: 2026-10-07 19:07+0530\n"
    6 "PO-Revision-Date: 2026-10-07 19:07+0530\n"
     5"POT-Creation-Date: 2026-10-14 20:17+0530\n"
     6"PO-Revision-Date: 2026-10-14 20:17+0530\n"
    77"Last-Translator: \n"
    88"Language-Team: AyeCode Ltd <contact@ayecode.io>\n"
    … …  
    2121"X-Poedit-SearchPath-0: .\n"
    2222
    23 #: includes/admin/admin-functions.php:87 includes/template-functions.php:613
     23#: includes/admin/admin-functions.php:87 includes/template-functions.php:649
    2424msgid "Event Date"
    2525msgstr ""
    … …  
    9696
    9797#: includes/admin/dummy-data/standard_events.php:86
    98 #: includes/template-functions.php:623
     98#: includes/template-functions.php:659
    9999msgid "Newest"
    100100msgstr ""
    101101
    102102#: includes/admin/dummy-data/standard_events.php:98
    103 #: includes/template-functions.php:633
     103#: includes/template-functions.php:669
    104104msgid "Title"
    105105msgstr ""
    106106
    107107#: includes/admin/dummy-data/standard_events.php:110
    108 #: includes/template-functions.php:643
     108#: includes/template-functions.php:679
    109109msgid "Rating"
    110110msgstr ""
    … …  
    20772077msgstr ""
    20782078
    2079 #: includes/template-functions.php:455 includes/template-functions.php:457
    2080 #: includes/template-functions.php:463
     2079#: includes/template-functions.php:473 includes/template-functions.php:479
    20812080#, php-format
    20822081msgid "- %s"
  • events-for-geodirectory/trunk/languages/geodirevents-en_US.pot

    r3732840 r3746726  
    22msgid ""
    33msgstr ""
    4 "Project-Id-Version: Events for GeoDirectory 2.3.33\n"
     4"Project-Id-Version: Events for GeoDirectory 2.3.34\n"
    55"Report-Msgid-Bugs-To: \n"
    6 "POT-Creation-Date: 2026-10-07 19:07+0530\n"
     6"POT-Creation-Date: 2026-10-14 20:16+0530\n"
    77"PO-Revision-Date: 2025-08-07 12:29+0530\n"
    88"Last-Translator: AyeCode Ltd <contact@ayecode.io>\n"
    … …  
    2222"X-Poedit-SearchPath-0: .\n"
    2323
    24 #: includes/admin/admin-functions.php:87 includes/template-functions.php:613
     24#: includes/admin/admin-functions.php:87 includes/template-functions.php:649
    2525msgid "Event Date"
    2626msgstr ""
    … …  
    9797
    9898#: includes/admin/dummy-data/standard_events.php:86
    99 #: includes/template-functions.php:623
     99#: includes/template-functions.php:659
    100100msgid "Newest"
    101101msgstr ""
    102102
    103103#: includes/admin/dummy-data/standard_events.php:98
    104 #: includes/template-functions.php:633
     104#: includes/template-functions.php:669
    105105msgid "Title"
    106106msgstr ""
    107107
    108108#: includes/admin/dummy-data/standard_events.php:110
    109 #: includes/template-functions.php:643
     109#: includes/template-functions.php:679
    110110msgid "Rating"
    111111msgstr ""
    … …  
    20792079msgstr ""
    20802080
    2081 #: includes/template-functions.php:455 includes/template-functions.php:457
    2082 #: includes/template-functions.php:463
     2081#: includes/template-functions.php:473 includes/template-functions.php:479
    20832082#, php-format
    20842083msgid "- %s"
  • events-for-geodirectory/trunk/readme.txt

    r3732840 r3746726  
    66Tested up to: 7.1
    77Requires PHP: 7.2
    8 Stable tag: 2.3.33
     8Stable tag: 2.3.34
    99License: GPLv3
    1010License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    7474== Changelog ==
    7575
     76= 2.3.34 - 2026-10-14 =
     77* BS > Post Title renders html in event title - FIXED
     78
    7679= 2.3.33 - 2026-10-07 =
    7780* Better sanitation and escaping for event calendar, search and AYI widget - FIXED/SECURITY
Note: See TracChangeset for help on using the changeset viewer.