diff --git a/common b/common index 2c5759859f..965217bb1e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2c5759859fe88ea44a033b180369b46438e7d70d +Subproject commit 965217bb1edf012f7de51036802b264c7da6202d diff --git a/src/Tribe/Admin/Notice/Marketing.php b/src/Tribe/Admin/Notice/Marketing.php index e731283343..ca4f4b1af4 100644 --- a/src/Tribe/Admin/Notice/Marketing.php +++ b/src/Tribe/Admin/Notice/Marketing.php @@ -45,7 +45,7 @@ public function should_display() { public function notice() { $link = sprintf( '%2$s', - esc_url( 'https://m.tri.be/1a3l' ), + esc_url( 'https://evnt.is/1a3l' ), esc_html_x( 'take the survey now', '2018 user survey', 'the-events-calendar' ) ); diff --git a/src/Tribe/Admin/Notice/Timezones.php b/src/Tribe/Admin/Notice/Timezones.php index 1f77fa6d79..8c9c281b1e 100644 --- a/src/Tribe/Admin/Notice/Timezones.php +++ b/src/Tribe/Admin/Notice/Timezones.php @@ -142,7 +142,7 @@ public function notice() { $text = []; $current_utc = Timezones::wp_timezone_string(); - $url = 'http://m.tri.be/1ad3'; + $url = 'http://evnt.is/1ad3'; $link = sprintf( '%2$s', esc_url( $url ), diff --git a/src/Tribe/Aggregator/Record/Abstract.php b/src/Tribe/Aggregator/Record/Abstract.php index a2c673d228..5e6866bf70 100644 --- a/src/Tribe/Aggregator/Record/Abstract.php +++ b/src/Tribe/Aggregator/Record/Abstract.php @@ -425,9 +425,9 @@ public function dont_change_post_modified( $data, $postarr ) { /** * Preps post arguments for create/save * - * @param string $type Type of record to create - manual or schedule - * @param array $args Post type args - * @param array $meta Post meta + * @param string $type Type of record to create - manual or schedule + * @param object $args Post type args + * @param array $meta Post meta * * @return array */ @@ -528,7 +528,7 @@ public function create_schedule_record() { $frequency = Tribe__Events__Aggregator__Cron::instance()->get_frequency( [ 'id' => $this->meta['frequency'] ] ); if ( ! $frequency ) { - return tribe_error( 'core:aggregator:invalid-record-frequency', $meta ); + return tribe_error( 'core:aggregator:invalid-record-frequency', $this->meta ); } // Setups the post_content as the Frequency (makes it easy to fetch by frequency) @@ -1552,7 +1552,7 @@ public function insert_posts( $items = [] ) { } // Do we have an existing venue for this event that we should preserve? - // @todo review: should we care about the potential for multiple venue IDs? + // @todo [BTRIA-588]: Review - should we care about the potential for multiple venue IDs? if ( ! empty( $event['ID'] ) && 'preserve_changes' === $update_authority_setting @@ -2813,4 +2813,3 @@ public function generate_next_batch_hash() { return md5( uniqid( '', true ) ); } } - diff --git a/src/Tribe/Aggregator/Service.php b/src/Tribe/Aggregator/Service.php index c371c7ad81..087ee75f8a 100644 --- a/src/Tribe/Aggregator/Service.php +++ b/src/Tribe/Aggregator/Service.php @@ -771,8 +771,8 @@ protected function register_messages() { ); $meetup_api_changes_link = sprintf( - '%s', - esc_html__( 'https://m.tri.be/1afb', 'the-events-calendar' ) + '%s', + esc_html__( 'https://evnt.is/1afb', 'the-events-calendar' ) ); $this->service_messages = [ diff --git a/src/Tribe/Aggregator/Tabs/New.php b/src/Tribe/Aggregator/Tabs/New.php index 2530acafe6..48a4df3ea4 100644 --- a/src/Tribe/Aggregator/Tabs/New.php +++ b/src/Tribe/Aggregator/Tabs/New.php @@ -258,7 +258,7 @@ public function get_result_messages( $queue ) { if ( ! empty( $item_updated ) ) { $content_label = 1 === $queue->activity->count( $content_post_type, 'updated' ) ? $content_type : $content_type_plural; - // @todo: include a part of sentence like: ", including %1$d %2$signored event%3$s.", , + // @todo [BTRIA-589]: Include a part of sentence like: ", including %1$d %2$signored event%3$s.", , . $messages['success'][] = sprintf( // add updated event count _n( '%1$d existing %2$s was updated.', '%1$d existing %2$s were updated.', $queue->activity->count( $content_post_type, 'updated' ), 'the-events-calendar' ), $queue->activity->count( $content_post_type, 'updated' ), @@ -526,14 +526,14 @@ public function maybe_display_aggregator_upsell() {

- + - + diff --git a/src/Tribe/Cost_Utils.php b/src/Tribe/Cost_Utils.php index 503acbd780..276f36ae86 100644 --- a/src/Tribe/Cost_Utils.php +++ b/src/Tribe/Cost_Utils.php @@ -157,7 +157,7 @@ public function has_uncosted_events() { return (bool) $have_uncosted; } - // @todo consider expanding our logic for improved handling of private posts etc + // @todo [BTRIA-601]: Consider expanding our logic for improved handling of private posts etc. $uncosted = $wpdb->get_var( $wpdb->prepare( " SELECT ID FROM {$wpdb->posts} diff --git a/src/Tribe/Gutenberg.php b/src/Tribe/Gutenberg.php index d50e6dde02..58bd6d7e04 100644 --- a/src/Tribe/Gutenberg.php +++ b/src/Tribe/Gutenberg.php @@ -108,7 +108,7 @@ public function notice() { return false; } - $url = 'http://m.tri.be/19zc'; + $url = 'http://evnt.is/19zc'; $link = sprintf( '%2$s', esc_url( $url ), diff --git a/src/Tribe/JSON_LD/Event.php b/src/Tribe/JSON_LD/Event.php index db7a6ae8bc..0122a5a998 100644 --- a/src/Tribe/JSON_LD/Event.php +++ b/src/Tribe/JSON_LD/Event.php @@ -108,7 +108,7 @@ public function get_data( $posts = null, $args = [] ) { $data->startDate = Tribe__Events__Timezones::to_utc( tribe_get_start_date( $post_id, true, Tribe__Date_Utils::DBDATETIMEFORMAT ), $tz_string, 'c' ); $data->endDate = Tribe__Events__Timezones::to_utc( tribe_get_end_date( $post_id, true, Tribe__Date_Utils::DBDATETIMEFORMAT ), $tz_string, 'c' ); - // @todo once #90984 is resolved this extra step should not be required + // @todo [BTRIA-590]: Once #90984 is resolved this extra step should not be required. if ( ! empty( $tz_string ) ) { $data->startDate = $this->get_localized_iso8601_string( $data->startDate, $tz_string ); $data->endDate = $this->get_localized_iso8601_string( $data->endDate, $tz_string ); diff --git a/src/Tribe/JSON_LD/Organizer.php b/src/Tribe/JSON_LD/Organizer.php index 977ca8a192..0b71195513 100644 --- a/src/Tribe/JSON_LD/Organizer.php +++ b/src/Tribe/JSON_LD/Organizer.php @@ -71,7 +71,7 @@ public function get_data( $post = null, $args = [ 'context' => false ] ) { * @return false|string Link to the event or false */ protected function get_link( $post ) { - // @TODO Move this logic to Pro once #33734 is handled. + // @todo [BTRIA-591]: Move this logic to Pro once #33734 is handled. if ( class_exists( 'Tribe__Events__Pro__Main' ) ) { $link = tribe_get_organizer_link( $post, false ); } else { diff --git a/src/Tribe/JSON_LD/Venue.php b/src/Tribe/JSON_LD/Venue.php index 05ddea5fd5..a332b9c0bd 100644 --- a/src/Tribe/JSON_LD/Venue.php +++ b/src/Tribe/JSON_LD/Venue.php @@ -92,7 +92,7 @@ public function get_data( $post = null, $args = [ 'context' => false ] ) { * @return false|string Link to the event or false */ protected function get_link( $post ) { - // @TODO Move this logic to Pro once #33734 is handled. + // @todo [BTRIA-591]: Move this logic to Pro once #33734 is handled. if ( class_exists( 'Tribe__Events__Pro__Main' ) ) { $link = tribe_get_venue_link( $post, false ); } else { diff --git a/src/Tribe/Main.php b/src/Tribe/Main.php index f0249f3ff9..2f93724155 100644 --- a/src/Tribe/Main.php +++ b/src/Tribe/Main.php @@ -153,7 +153,7 @@ class Tribe__Events__Main { */ public $activation_page; - // @todo remove in 4.0 + // @todo [BTRIA-602]: Remove in 4.0. public $upcomingSlug = 'upcoming'; public $pastSlug = 'past'; @@ -938,7 +938,7 @@ protected function addHooks() { // Register slug conflict notices (but test to see if tribe_notice() is indeed available, in case another plugin // is hosting an earlier version of tribe-common which is already active) // - // @todo remove this safety check when we're confident the risk has diminished + // @todo [BTRIA-603]: Remove this safety check when we're confident the risk has diminished. if ( function_exists( 'tribe_notice' ) ) { tribe_notice( 'archive-slug-conflict', @@ -1079,7 +1079,7 @@ public function activation_page() { // plugin hosting an earlier version of tribe-common is already active we could hit fatals // if we don't take this precaution). // - // @todo remove class_exists() test once enough time has elapsed and the risk has reduced + // @todo [BTRIA-604]: Remove class_exists() test once enough time has elapsed and the risk has reduced. if ( empty( $this->activation_page ) && class_exists( 'Tribe__Admin__Activation_Page' ) ) { $this->activation_page = new Tribe__Admin__Activation_Page( [ @@ -1413,7 +1413,7 @@ public function filter_tracker_event_taxonomies( array $taxonomies ) { * @return void */ public function add_help_section_feature_box_content( $help ) { - $link = '' . esc_html__( 'New User Primer', 'the-events-calendar' ) . ''; + $link = '' . esc_html__( 'New User Primer', 'the-events-calendar' ) . ''; $help->add_section_content( 'feature-box', sprintf( __( 'We are committed to helping make your calendar spectacular and have a wealth of resources available, including a handy %s to get your calendar up and running.', 'the-events-calendar' ), $link ) ); } @@ -1436,7 +1436,7 @@ public function add_help_section_support_content( $help ) { '%s: A thorough walkthrough of The Events Calendar and the settings that are available to you.', 'the-events-calendar' ), - '' . esc_html__( 'Settings overview', 'the-events-calendar' ) . '' + '' . esc_html__( 'Settings overview', 'the-events-calendar' ) . '' ), sprintf( @@ -1444,7 +1444,7 @@ public function add_help_section_support_content( $help ) { '%s: A complete look at the features you can expect to see right out of the box as well as how to use them.', 'the-events-calendar' ), - '' . esc_html__( 'Features overview', 'the-events-calendar' ) . '' + '' . esc_html__( 'Features overview', 'the-events-calendar' ) . '' ), sprintf( @@ -1452,7 +1452,7 @@ public function add_help_section_support_content( $help ) { '%s: Our most comprehensive outline for customizing the calendar to suit your needs, including custom layouts and styles.', 'the-events-calendar' ), - '' . esc_html__( "Themer's Guide", 'the-events-calendar' ) . '' + '' . esc_html__( "Themer's Guide", 'the-events-calendar' ) . '' ), sprintf( @@ -1460,7 +1460,7 @@ public function add_help_section_support_content( $help ) { '%s: An overview of the default templates and styles that are included in the plugin, as well as how to change them.', 'the-events-calendar' ), - '' . esc_html__( 'Using stylesheets and page templates', 'the-events-calendar' ) . '' + '' . esc_html__( 'Using stylesheets and page templates', 'the-events-calendar' ) . '' ), sprintf( @@ -1468,7 +1468,7 @@ public function add_help_section_support_content( $help ) { '%s: Do you see an issue with your calendar? Go here first to find where it’s coming from and how to fix it.', 'the-events-calendar' ), - '' . esc_html__( 'Troubleshooting common problems', 'the-events-calendar' ) . '' + '' . esc_html__( 'Troubleshooting common problems', 'the-events-calendar' ) . '' ), sprintf( @@ -1476,7 +1476,7 @@ public function add_help_section_support_content( $help ) { '%s: Code and guides for customizing your calendar in useful and interesting ways.', 'the-events-calendar' ), - '' . esc_html__( 'Customizing the Events plugins', 'the-events-calendar' ) . '' + '' . esc_html__( 'Customizing the Events plugins', 'the-events-calendar' ) . '' ), ], 15 @@ -1497,7 +1497,7 @@ public function add_help_section_extra_content( $help ) { $link_et = '' . esc_html__( 'Events Tickets', 'the-events-calendar' ) . ''; $help->add_section_content( 'extra-help', sprintf( __( 'If you have tried the above steps and are still having trouble, you can post a new thread to our WordPress.org forums for %1$s or %2$s. Our support staff monitors these forums once a week and would be happy to assist you there. ', 'the-events-calendar' ), $link_tec, $link_et ), 20 ); - $link = '' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . ''; + $link = '' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . ''; $help->add_section_content( 'extra-help', sprintf( __( 'Looking for more immediate support? We offer %s with the purchase of any of our premium plugins. Pick up a license and you can post there directly and expect a response within 24-48 hours during weekdays', 'the-events-calendar' ), $link ), 20 ); } elseif ( ! $help->is_active( [ 'events-calendar-pro', 'event-tickets' ] ) ) { @@ -1505,13 +1505,13 @@ public function add_help_section_extra_content( $help ) { $link = '' . esc_html__( 'open-source forum on WordPress.org', 'the-events-calendar' ) . ''; $help->add_section_content( 'extra-help', sprintf( __( 'If you have tried the above steps and are still having trouble, you can post a new thread to our %s. Our support staff monitors these forums once a week and would be happy to assist you there.', 'the-events-calendar' ), $link ), 20 ); - $link_forum = '' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . ''; - $link_plus = '' . esc_html__( 'Events Calendar PRO', 'the-events-calendar' ) . ''; + $link_forum = '' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . ''; + $link_plus = '' . esc_html__( 'Events Calendar PRO', 'the-events-calendar' ) . ''; $help->add_section_content( 'extra-help', sprintf( __( 'Looking for more immediate support? We offer %1$s with the purchase of any of our premium plugins (like %2$s). Pick up a license and you can post there directly and expect a response within 24-48 hours during weekdays.', 'the-events-calendar' ), $link_forum, $link_plus ), 20 ); } else { - $link = '' . esc_html__( 'post a thread', 'the-events-calendar' ) . ''; + $link = '' . esc_html__( 'post a thread', 'the-events-calendar' ) . ''; $help->add_section_content( 'extra-help', sprintf( __( 'If you have a valid license for one of our paid plugins, you can %s in our premium support forums. Our support team monitors the forums and will respond to your thread within 24-48 hours (during the week).', 'the-events-calendar' ), $link ), 20 ); } @@ -1569,7 +1569,8 @@ public function get_event_label_singular() { /** * Load the day view template tags * Loaded late due to potential upgrade conflict since moving them from pro - * @TODO move this require to be with the rest of the template tag includes in 3.9 + * + * @todo [BTRIA-620]: move this require to be with the rest of the template tag includes in 3.9 */ public function init_day_view() { // load day view functions @@ -1972,7 +1973,7 @@ public function add_space_to_rss( $title ) { * @param array $classes * * @return array - * @TODO move this to template class + * @todo move this to template class */ public function body_class( $classes ) { if ( get_query_var( 'post_type' ) == self::POSTTYPE ) { @@ -1990,7 +1991,7 @@ public function body_class( $classes ) { * @param array $classes * * @return array - * @TODO move this to template class + * @todo move this to template class */ public function post_class( $classes ) { global $post; @@ -2602,7 +2603,7 @@ public function default_view() { } public function setup_l10n_strings() { - // @todo these members became deprecated in 4.4 - remove in future release + // @todo [BTRIA-605]: These members became deprecated in 4.4 - remove in future release. $this->monthsFull = Tribe__Date_Utils::get_localized_months_full(); $this->monthsShort = Tribe__Date_Utils::get_localized_months_short(); $this->daysOfWeek = Tribe__Date_Utils::get_localized_weekdays_full(); @@ -3762,7 +3763,7 @@ public function verify_unique_name( $name, $post_type ) { $post_type = Tribe__Events__Organizer::POSTTYPE; } - // TODO update this verification to check all post_status <> 'trash' + // @todo [BTRIA-606]: Update this verification to check all post_status <> 'trash'. $results = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$wpdb->posts} WHERE post_type = %s && post_title = %s && post_status = 'publish'", $post_type, $name ) ); return ( $results ) ? 0 : 1; diff --git a/src/Tribe/Query.php b/src/Tribe/Query.php index 98cd9e27b7..af8305320f 100755 --- a/src/Tribe/Query.php +++ b/src/Tribe/Query.php @@ -342,7 +342,7 @@ public static function pre_get_posts( $query ) { $skip_event_display_filters = is_admin() && $query->is_main_query() && ! tribe_is_ajax_view_request(); - //@todo stop calling EOD cutoff transformations all over the place + // @todo [BTRIA-607]: Stop calling EOD cutoff transformations all over the place. if ( ! empty( $query->query_vars['eventDisplay'] ) && ! $skip_event_display_filters ) { switch ( $query->query_vars['eventDisplay'] ) { case 'custom': diff --git a/src/Tribe/Repositories/Event.php b/src/Tribe/Repositories/Event.php index 6c8b0919c8..961d4b5d89 100644 --- a/src/Tribe/Repositories/Event.php +++ b/src/Tribe/Repositories/Event.php @@ -1285,7 +1285,7 @@ protected function update_date_meta( array $postarr, $post_id = null ) { * @return array The filtered event post array. */ protected function update_linked_post_meta( array $postarr ) { - // @todo create linked posts here?! Using ORM? + // @todo [BTRIA-592]: Create linked posts here?! Using ORM? if ( isset( $postarr['meta_input']['_EventVenueID'] ) && ! tribe_is_venue( $postarr['meta_input']['_EventVenueID'] ) ) { unset( $postarr['meta_input']['_EventVenueID'] ); } diff --git a/src/Tribe/Template/Month.php b/src/Tribe/Template/Month.php index a1e1af1cc0..240c501354 100755 --- a/src/Tribe/Template/Month.php +++ b/src/Tribe/Template/Month.php @@ -1219,7 +1219,7 @@ public function event_classes( $classes = '' ) { $post = $day['events']->post; - // @todo review whether the erasure of any existing classes is generally desirable + // @todo [BTRIA-593]: Review whether the erasure of any existing classes is generally desirable. $classes = []; $tribe_cat_slugs = tribe_get_event_cat_slugs( $post->ID ); diff --git a/src/Tribe/Templates.php b/src/Tribe/Templates.php index 0018d68b50..b909569f0c 100755 --- a/src/Tribe/Templates.php +++ b/src/Tribe/Templates.php @@ -516,8 +516,7 @@ public static function showInLoops( $query ) { if ( ! is_admin() && tribe_get_option( 'showInLoops' ) && ( $query->is_home() || $query->is_tag ) && empty( $query->query_vars['post_type'] ) && false == $query->query_vars['suppress_filters'] ) { - // @todo remove - // 3.3 know-how for main query check + // @todo [BTRIA-608]: Remove - 3.3 know-how for main query check. if ( self::is_main_loop( $query ) ) { self::$isMainLoop = true; $post_types = [ 'post', Tribe__Events__Main::POSTTYPE ]; diff --git a/src/Tribe/Venue.php b/src/Tribe/Venue.php index d7556a913c..77dd942f37 100644 --- a/src/Tribe/Venue.php +++ b/src/Tribe/Venue.php @@ -315,7 +315,7 @@ public function save_meta( $venue_id, $data ) { */ do_action( 'tribe_events_venue_save', $venue_id, $data, $venue ); - // TODO: We should probably do away with 'StateProvince' and stick to 'State' and 'Province'. + // @todo [BTRIA-609]: We should probably do away with 'StateProvince' and stick to 'State' and 'Province'. if ( ! isset( $data['StateProvince'] ) || $data['StateProvince'] == '' ) { if ( isset( $data['State'] ) && $data['State'] != '' diff --git a/src/Tribe/Views/V2/Query/Event_Query_Controller.php b/src/Tribe/Views/V2/Query/Event_Query_Controller.php index 045b791458..d6836b6efb 100644 --- a/src/Tribe/Views/V2/Query/Event_Query_Controller.php +++ b/src/Tribe/Views/V2/Query/Event_Query_Controller.php @@ -38,7 +38,7 @@ protected function get_default_post_types() { * {@inheritDoc} */ protected function repository() { - // @todo refine this to handle order depending on the View. + // @todo [BTRIA-594]: Refine this to handle order depending on the View. return tribe_events()->order_by( 'event_date', 'ASC' ); } diff --git a/src/Tribe/Views/V2/Repository/Event_Period.php b/src/Tribe/Views/V2/Repository/Event_Period.php index d0b33e53fd..82c22fda6c 100644 --- a/src/Tribe/Views/V2/Repository/Event_Period.php +++ b/src/Tribe/Views/V2/Repository/Event_Period.php @@ -116,7 +116,7 @@ class Event_Period implements Core_Read_Interface { * the posts by in the shape [ , ]. * * @return Tribe__Repository__Read_Interface */ public function by_args( array $args ) { - // TODO: Implement by_args() method. + // @todo [BTRIA-595]: Implement by_args() method. } /** @@ -191,7 +191,7 @@ public function base_repository() { * @return Tribe__Repository__Read_Interface */ public function page( $page ) { - // TODO: Implement page() method. + // @todo [BTRIA-595]: Implement page() method. } /** @@ -206,7 +206,7 @@ public function page( $page ) { * @return Tribe__Repository__Read_Interface */ public function per_page( $per_page ) { - // TODO: Implement per_page() method. + // @todo [BTRIA-595]: Implement per_page() method. } /** @@ -220,7 +220,7 @@ public function per_page( $per_page ) { * @return int */ public function found() { - // TODO: Implement found() method. + // @todo [BTRIA-595]: Implement found() method. } /** @@ -231,7 +231,7 @@ public function found() { * @return array */ public function all() { - // TODO: Implement all() method. + // @todo [BTRIA-595]: Implement all() method. } /** @@ -249,7 +249,7 @@ public function all() { * @return Tribe__Repository__Read_Interface */ public function offset( $offset, $increment = false ) { - // TODO: Implement offset() method. + // @todo [BTRIA-595]: Implement offset() method. } /** @@ -265,7 +265,7 @@ public function offset( $offset, $increment = false ) { * @return Tribe__Repository__Read_Interface */ public function order( $order = 'ASC' ) { - // TODO: Implement order() method. + // @todo [BTRIA-595]: Implement order() method. } /** @@ -283,7 +283,7 @@ public function order( $order = 'ASC' ) { * @return Tribe__Repository__Read_Interface */ public function order_by( $order_by, $order = 'DESC' ) { - // TODO: Implement order_by() method. + // @todo [BTRIA-595]: Implement order_by() method. } /** @@ -299,7 +299,7 @@ public function order_by( $order_by, $order = 'DESC' ) { * @return Tribe__Repository__Read_Interface */ public function fields( $fields ) { - // TODO: Implement fields() method. + // @todo [BTRIA-595]: Implement fields() method. } /** @@ -314,7 +314,7 @@ public function fields( $fields ) { * @return Tribe__Repository__Read_Interface */ public function in( $post_ids ) { - // TODO: Implement in() method. + // @todo [BTRIA-595]: Implement in() method. } /** @@ -329,7 +329,7 @@ public function in( $post_ids ) { * @return Tribe__Repository__Read_Interface */ public function not_in( $post_ids ) { - // TODO: Implement not_in() method. + // @todo [BTRIA-595]: Implement not_in() method. } /** @@ -344,7 +344,7 @@ public function not_in( $post_ids ) { * @return Tribe__Repository__Read_Interface */ public function parent( $post_id ) { - // TODO: Implement parent() method. + // @todo [BTRIA-595]: Implement parent() method. } /** @@ -359,7 +359,7 @@ public function parent( $post_id ) { * @return Tribe__Repository__Read_Interface */ public function parent_in( $post_ids ) { - // TODO: Implement parent_in() method. + // @todo [BTRIA-595]: Implement parent_in() method. } /** @@ -374,7 +374,7 @@ public function parent_in( $post_ids ) { * @return Tribe__Repository__Read_Interface */ public function parent_not_in( $post_ids ) { - // TODO: Implement parent_not_in() method. + // @todo [BTRIA-595]: Implement parent_not_in() method. } /** @@ -389,7 +389,7 @@ public function parent_not_in( $post_ids ) { * @return Tribe__Repository__Read_Interface */ public function search( $search ) { - // TODO: Implement search() method. + // @todo [BTRIA-595]: Implement search() method. } /** @@ -406,7 +406,7 @@ public function search( $search ) { * @return int */ public function count() { - // TODO: Implement count() method. + // @todo [BTRIA-595]: Implement count() method. } /** @@ -423,7 +423,7 @@ public function count() { * @see Tribe__Repository__Read_Interface::per_page() */ public function first() { - // TODO: Implement first() method. + // @todo [BTRIA-595]: Implement first() method. } /** @@ -440,7 +440,7 @@ public function first() { * @see Tribe__Repository__Read_Interface::per_page() */ public function last() { - // TODO: Implement last() method. + // @todo [BTRIA-595]: Implement last() method. } /** @@ -460,7 +460,7 @@ public function last() { * @see Tribe__Repository__Read_Interface::per_page() */ public function nth( $n ) { - // TODO: Implement nth() method. + // @todo [BTRIA-595]: Implement nth() method. } /** @@ -477,7 +477,7 @@ public function nth( $n ) { * @see Tribe__Repository__Read_Interface::per_page() */ public function take( $n ) { - // TODO: Implement take() method. + // @todo [BTRIA-595]: Implement take() method. } /** @@ -495,7 +495,7 @@ public function take( $n ) { * @see \wp_list_pluck() */ public function pluck( $field ) { - // TODO: Implement pluck() method. + // @todo [BTRIA-595]: Implement pluck() method. } /** @@ -518,7 +518,7 @@ public function pluck( $field ) { * @see \wp_list_filter() */ public function filter( $args = array(), $operator = 'AND' ) { - // TODO: Implement filter() method. + // @todo [BTRIA-595]: Implement filter() method. } /** @@ -540,7 +540,7 @@ public function filter( $args = array(), $operator = 'AND' ) { * @see \wp_list_sort() */ public function sort( $orderby = array(), $order = 'ASC', $preserve_keys = false ) { - // TODO: Implement sort() method. + // @todo [BTRIA-595]: Implement sort() method. } /** @@ -551,7 +551,7 @@ public function sort( $orderby = array(), $order = 'ASC', $preserve_keys = false * @return \Tribe__Utils__Post_Collection */ public function collect() { - // TODO: Implement collect() method. + // @todo [BTRIA-595]: Implement collect() method. } /** diff --git a/src/Tribe/Views/V2/Repository/Events_Result_Set.php b/src/Tribe/Views/V2/Repository/Events_Result_Set.php index bdf7e3204d..cdd565a1e1 100644 --- a/src/Tribe/Views/V2/Repository/Events_Result_Set.php +++ b/src/Tribe/Views/V2/Repository/Events_Result_Set.php @@ -152,7 +152,7 @@ public function order_by( $order_by, $order ) { throw new \InvalidArgumentException( 'Order "' . $order . '" is not supported, only "ASC" and "DESC" are.' ); } - // @todo @be here support more ordering criteria than date. + // @todo [BTRIA-596]: @be Support more ordering criteria than date. $order_by_key_map = [ 'event_date' => 'start_date', ]; diff --git a/src/Tribe/Views/V2/Rest_Endpoint.php b/src/Tribe/Views/V2/Rest_Endpoint.php index 15b02bc68b..2e8406494c 100644 --- a/src/Tribe/Views/V2/Rest_Endpoint.php +++ b/src/Tribe/Views/V2/Rest_Endpoint.php @@ -167,7 +167,7 @@ public function register() { return register_rest_route( static::ROOT_NAMESPACE, '/html', [ // Support both GET and POST HTTP methods: we originally used GET. 'methods' => [ Server::READABLE, Server::CREATABLE ], - // @todo Make sure we do proper handling of cache longer then 12h. + // @todo [BTRIA-600]: Make sure we do proper handling of caches longer then 12h. 'permission_callback' => static function ( Request $request ) { /* @@ -183,10 +183,10 @@ public function register() { && ! is_wp_error( $auth ) && wp_verify_nonce( $request->get_param( '_wpnonce' ), 'wp_rest' ); }, - 'callback' => static function ( Request $request ) { + 'callback' => static function ( Request $request ) { View::make_for_rest( $request )->send_html(); }, - 'args' => $this->get_request_arguments(), + 'args' => $this->get_request_arguments(), ] ); } diff --git a/src/Tribe/Views/V2/Utils/Stack.php b/src/Tribe/Views/V2/Utils/Stack.php index 2f4225b349..a70cc72ff1 100644 --- a/src/Tribe/Views/V2/Utils/Stack.php +++ b/src/Tribe/Views/V2/Utils/Stack.php @@ -126,7 +126,7 @@ public function build_from_events( array $events_by_day = [], $spacer = null, $r return []; } - // @todo @be we use the spacer someplace, refer it to this value. + // @todo [BTRIA-597]: @be We use the spacer someplace, find it and refer it to this value. $this->spacer = null !== $spacer ? $spacer : $this->get_spacer(); $this->recycle_space = null !== $recycle_space ? (bool) $recycle_space diff --git a/src/Tribe/Views/V2/Views/By_Day_View.php b/src/Tribe/Views/V2/Views/By_Day_View.php index cf4792f47d..68771e74f4 100644 --- a/src/Tribe/Views/V2/Views/By_Day_View.php +++ b/src/Tribe/Views/V2/Views/By_Day_View.php @@ -167,7 +167,7 @@ public function get_grid_days( $date = null, $force = false ) { $this->warmup_cache( 'grid_days_found', 0, Cache_Listener::TRIGGER_SAVE_POST ); $events_per_day = $this->get_events_per_day(); - // @todo remove this when the Event_Period repository is solid and clean up. + // @todo [BTRIA-599]: Remove this when the Event_Period repository is solid and cleaned up. $using_period_repository = tribe_events_view_v2_use_period_repository(); $use_site_timezone = Timezones::is_mode( 'site' ); diff --git a/src/Tribe/Views/V2/Views/Traits/With_Fast_Forward_Link.php b/src/Tribe/Views/V2/Views/Traits/With_Fast_Forward_Link.php index 1c0f164029..1cb6796a81 100644 --- a/src/Tribe/Views/V2/Views/Traits/With_Fast_Forward_Link.php +++ b/src/Tribe/Views/V2/Views/Traits/With_Fast_Forward_Link.php @@ -84,7 +84,7 @@ public function use_ff_link( $canonical = false, array $passthru_vars = [] ) { // Don't do filter checks if taxonomy check has failed. if ( $use_ff_link ) { - // @todo move this to Filterbar @stephen + // @todo [BTRIA-598]: @stephen Move this to Filterbar. $filters = array_filter( (array) $this->context->get( 'view_data' ) ); if ( isset( $filters['url'] ) ) { diff --git a/src/Tribe/iCal.php b/src/Tribe/iCal.php index 23d23b085a..c84ce3d5e0 100755 --- a/src/Tribe/iCal.php +++ b/src/Tribe/iCal.php @@ -505,7 +505,7 @@ protected function get_timezones( $events = [] ) { $start = new DateTime( $transition['time'], $timezone ); $item[] = 'DTSTART:' . $start->format( "Ymd\THis" ); } catch ( Exception $e ) { - // TODO: report this exception + // @todo [BTRIA-610]: report this exception } $item[] = 'END:' . $type; $last_transition = $transition; diff --git a/src/admin-views/admin-update-message.php b/src/admin-views/admin-update-message.php index fa768062e9..4014f3ca91 100755 --- a/src/admin-views/admin-update-message.php +++ b/src/admin-views/admin-update-message.php @@ -58,11 +58,11 @@

-
-
-
-
-

+
+
+
+
+

diff --git a/src/admin-views/admin-welcome-message.php b/src/admin-views/admin-welcome-message.php index 9d1d2a779a..8266d6040d 100755 --- a/src/admin-views/admin-welcome-message.php +++ b/src/admin-views/admin-welcome-message.php @@ -50,7 +50,7 @@ class="tribe-events-admin-card__image" />
- +
- +
- +
@@ -81,7 +81,7 @@ class="tribe-events-admin-card__image" />
- +
@@ -91,7 +91,7 @@ class="tribe-events-admin-card__image" alt="" />
- +
- + diff --git a/src/admin-views/aggregator/settings.php b/src/admin-views/aggregator/settings.php index a560a4b6b4..9c403560ef 100644 --- a/src/admin-views/aggregator/settings.php +++ b/src/admin-views/aggregator/settings.php @@ -701,7 +701,7 @@ class_exists( 'Tribe__Events__Tickets__Eventbrite__Main' ) ob_start(); ?>

- + @@ -130,7 +130,7 @@ $indicator = 'good'; $notes = ' '; - // @todo add API request for pingback check + // @todo [BTRIA-612]: add API request for pingback check if ( defined( 'DISABLE_WP_CRON' ) && true === DISABLE_WP_CRON ) { $indicator = 'warning'; $text = __( 'WP Cron not enabled', 'the-events-calendar' ); diff --git a/src/admin-views/create-venue-fields.php b/src/admin-views/create-venue-fields.php index e323e0f22a..05a3445c3a 100644 --- a/src/admin-views/create-venue-fields.php +++ b/src/admin-views/create-venue-fields.php @@ -210,10 +210,7 @@ class="tribe-dropdown" /** * Only show the Google map toggles on the admin screens - * @since - * @central #73813 - * - * @TODO ascertain version number + * @since 4.5.4 * */ if ( ! is_admin() ) { @@ -296,4 +293,4 @@ class="tribe-dropdown" [ 'type' => 'text', 'label' => __( 'Month view events per day', 'the-events-calendar' ), - 'tooltip' => sprintf( __( 'Change the default 3 events per day in month view. To impose no limit, you may specify -1. Please note there may be performance issues if you allow too many events per day. Read more.', 'the-events-calendar' ), 'https://m.tri.be/rh' ), + 'tooltip' => sprintf( __( 'Change the default 3 events per day in month view. To impose no limit, you may specify -1. Please note there may be performance issues if you allow too many events per day. Read more.', 'the-events-calendar' ), 'https://evnt.is/rh' ), 'validation_type' => 'int', 'size' => 'small', 'default' => '3', @@ -266,7 +266,7 @@ 'enable_month_view_cache' => [ 'type' => 'checkbox_bool', 'label' => __( 'Enable the Month View Cache', 'the-events-calendar' ), - 'tooltip' => sprintf( __( 'Check this to cache your month view HTML in transients, which can help improve calendar speed on sites with many events. Read more.', 'the-events-calendar' ), 'https://m.tri.be/18di' ), + 'tooltip' => sprintf( __( 'Check this to cache your month view HTML in transients, which can help improve calendar speed on sites with many events. Read more.', 'the-events-calendar' ), 'https://evnt.is/18di' ), 'default' => true, 'validation_type' => 'boolean', ], diff --git a/src/admin-views/tribe-options-upgrade.php b/src/admin-views/tribe-options-upgrade.php index 493a0bf52d..fb6a7504e9 100644 --- a/src/admin-views/tribe-options-upgrade.php +++ b/src/admin-views/tribe-options-upgrade.php @@ -54,7 +54,7 @@

- + @@ -98,7 +98,7 @@

', + '', '' ); ?>

diff --git a/src/admin-views/widgets/components/checkbox.php b/src/admin-views/widgets/components/checkbox.php index 556f9b5c9a..6332813678 100644 --- a/src/admin-views/widgets/components/checkbox.php +++ b/src/admin-views/widgets/components/checkbox.php @@ -7,7 +7,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @version 5.3.0 * diff --git a/src/admin-views/widgets/components/dropdown.php b/src/admin-views/widgets/components/dropdown.php index 928dafcd1f..84507e7061 100644 --- a/src/admin-views/widgets/components/dropdown.php +++ b/src/admin-views/widgets/components/dropdown.php @@ -7,7 +7,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @version 5.3.0 * diff --git a/src/admin-views/widgets/components/fieldset.php b/src/admin-views/widgets/components/fieldset.php index 51c3b9e490..ea661a9ee9 100644 --- a/src/admin-views/widgets/components/fieldset.php +++ b/src/admin-views/widgets/components/fieldset.php @@ -9,7 +9,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @version 5.3.0 * diff --git a/src/admin-views/widgets/components/radio.php b/src/admin-views/widgets/components/radio.php index 23128e3323..36b8c24423 100644 --- a/src/admin-views/widgets/components/radio.php +++ b/src/admin-views/widgets/components/radio.php @@ -7,7 +7,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @version 5.3.0 * diff --git a/src/admin-views/widgets/components/section.php b/src/admin-views/widgets/components/section.php index 16aa66ef10..b1b9ea194e 100644 --- a/src/admin-views/widgets/components/section.php +++ b/src/admin-views/widgets/components/section.php @@ -9,7 +9,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @version 5.3.0 * diff --git a/src/admin-views/widgets/components/text.php b/src/admin-views/widgets/components/text.php index 5efa7bae2e..523cdc8457 100644 --- a/src/admin-views/widgets/components/text.php +++ b/src/admin-views/widgets/components/text.php @@ -7,7 +7,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @version 5.3.0 * diff --git a/src/admin-views/widgets/list.php b/src/admin-views/widgets/list.php index a5749585af..2948891531 100755 --- a/src/admin-views/widgets/list.php +++ b/src/admin-views/widgets/list.php @@ -7,7 +7,7 @@ * * See more documentation about our views templating system. * - * @link http://m.tri.be/1aiy + * @link http://evnt.is/1aiy * * @var Widget_Abstract $widget_obj An instance of the widget abstract. * @var array $admin_fields An array of admin fields to display in the widget form. diff --git a/src/functions/template-tags/date.php b/src/functions/template-tags/date.php index 75448665a3..f4c57df1a9 100755 --- a/src/functions/template-tags/date.php +++ b/src/functions/template-tags/date.php @@ -94,13 +94,14 @@ function tribe_event_is_on_date( $date = null, $event = null ) { // kludge if ( ! empty( $event->_end_date_fixed ) ) { - // @todo remove this once we can have all day events without a start / end time + // @todo [BTRIA-613]: remove this once we can have all day events without a start / end time. $event_end = date_create( date( Tribe__Date_Utils::DBDATETIMEFORMAT, $event_end ) ); $event_end->modify( '+1 day' ); $event_end = $event_end->format( 'U' ); } - /* note: + /* + * Note: * events that start exactly on the EOD cutoff will count on the following day * events that end exactly on the EOD cutoff will count on the previous day */ diff --git a/src/functions/template-tags/general.php b/src/functions/template-tags/general.php index 94574df0e1..c7d0f899a5 100755 --- a/src/functions/template-tags/general.php +++ b/src/functions/template-tags/general.php @@ -604,7 +604,6 @@ function tribe_meta_event_category_name() { * Get the current page template that we are on * * @category Events - * @todo Update the function name to ensure there are no namespace conflicts. * @return string Page template */ function tribe_get_current_template() { @@ -760,7 +759,6 @@ function tribe_events_event_classes( $event = 0, $echo = true ) { * @category Events * @param string|null $current_view * - * @todo move to template classes **/ function tribe_events_the_header_attributes( $current_view = null ) { @@ -1092,7 +1090,7 @@ function tribe_event_featured_image( $post_id = null, $size = 'full', $link = tr * 'tribe_events_event_schedule_details' filter, should none of the above settings be sufficient. * * @category Events - * @TODO use tribe_get_datetime_format() and related functions if possible + * @todo [BTRIA-644]: Use tribe_get_datetime_format() and related functions if possible. * * @param int|null $event The event post ID, or `null` to use the global event. * @param string $before A string to prepend before the schedule details. diff --git a/src/functions/template-tags/ical.php b/src/functions/template-tags/ical.php index c9a8d8ce13..58293995ca 100755 --- a/src/functions/template-tags/ical.php +++ b/src/functions/template-tags/ical.php @@ -1,6 +1,8 @@ ( title ) => ownProps.createDraft( { }, } ); -// TODO: need to remove the use of "maybe" functions as they hold logic they +// @todo [BTRIA-619]: need to remove the use of "maybe" functions as they hold logic they // ultimately should not. const removeVenue = ( dispatch, ownProps ) => () => { const { volatile, maybeRemoveEntry, details } = ownProps; diff --git a/src/modules/blocks/event-venue/template.js b/src/modules/blocks/event-venue/template.js index 166b07ad40..25f10a0d15 100644 --- a/src/modules/blocks/event-venue/template.js +++ b/src/modules/blocks/event-venue/template.js @@ -136,7 +136,7 @@ class EventVenue extends Component { } renderSearchOrCreate() { - // TODO: The store should not be passed through like this as a prop. + // @todo [BTRIA-618]: The store should not be passed through like this as a prop. // Instead, we should hook up the element with a HOC. const { isSelected, store, name, onItemSelect, onCreateNew } = this.props; return ( diff --git a/src/modules/data/search/thunks.js b/src/modules/data/search/thunks.js index 554b1becc9..f3c7e9bb93 100644 --- a/src/modules/data/search/thunks.js +++ b/src/modules/data/search/thunks.js @@ -12,7 +12,7 @@ const { request: { utils:requestUtils, } } = middlewares; -// TODO: There is a lot of logic in this thunk that should be moved into +// @todo [BTRIA-617]: There is a lot of logic in this thunk that should be moved into // each specific call instead. Given the function name and location, // "search" should only search given params and handle success/error. export const search = ( id, params ) => ( dispatch, getState ) => { diff --git a/src/modules/elements/upsell/element.js b/src/modules/elements/upsell/element.js index 92d281bb7a..d3ef53b83f 100644 --- a/src/modules/elements/upsell/element.js +++ b/src/modules/elements/upsell/element.js @@ -25,7 +25,7 @@ const Upsell = () => ( 'the-events-calendar' ) }