Merge branch 'master' of github.com:the-events-calendar/the-events-ca…

…lendar into release/B21.01

src/Tribe/Admin/Notice/Marketing.php

@@ -45,7 +45,7 @@ public function should_display() {
 	public function notice() {
 		$link = sprintf(
 			'<a href="%1$s" target="_blank">%2$s</a>',
-			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' )
 		);
 

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(
 			'<a href="%1$s" target="_blank">%2$s</a>',
 			esc_url( $url ),

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 ) );
 	}
 }
-

src/Tribe/Aggregator/Service.php

@@ -771,8 +771,8 @@ protected function register_messages() {
 		);
 
 		$meetup_api_changes_link = sprintf(
-			'<a href="https://m.tri.be/1afb">%s</a>',
-			esc_html__( 'https://m.tri.be/1afb', 'the-events-calendar' )
+			'<a href="https://evnt.is/1afb">%s</a>',
+			esc_html__( 'https://evnt.is/1afb', 'the-events-calendar' )
 		);
 
 		$this->service_messages = [

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.", <a href="/wp-admin/edit.php?post_status=tribe-ignored&post_type=tribe_events">, </a>
+				// @todo [BTRIA-589]: Include a part of sentence like: ", including %1$d %2$signored event%3$s.", <a href="/wp-admin/edit.php?post_status=tribe-ignored&post_type=tribe_events">, </a>.
 				$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() {
 
 			<p><?php esc_html_e( 'With Event Aggregator, you can import events from iCalendar, Google, and Meetup.com in a jiffy.', 'the-events-calendar' ); ?></p>
 
-			<a href="https://m.tri.be/196y" class="tribe-license-link tribe-button tribe-button-primary" target="_blank">
+			<a href="https://evnt.is/196y" class="tribe-license-link tribe-button tribe-button-primary" target="_blank">
 				<?php esc_html_e( 'Buy It Now', 'the-events-calendar' );?>
 				<span class="screen-reader-text">
 					<?php esc_html_e( 'opens in a new window', 'the-events-calendar' );?>
 				</span>
 			</a>
 
-			<a href="https://m.tri.be/196z" class="tribe-license-link tribe-button tribe-button-secondary" target="_blank">
+			<a href="https://evnt.is/196z" class="tribe-license-link tribe-button tribe-button-secondary" target="_blank">
 				<?php esc_html_e( 'Learn More', 'the-events-calendar' ); ?>
 				<span class="screen-reader-text">
 					<?php esc_html_e( 'opens in a new window', 'the-events-calendar' );?>

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}

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(
 			'<a href="%1$s" target="_blank">%2$s</a>',
 			esc_url( $url ),

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 );

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 {

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 {

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 = '<a href="https://m.tri.be/18j8" target="_blank">' . esc_html__( 'New User Primer', 'the-events-calendar' ) . '</a>';
+			$link = '<a href="https://evnt.is/18j8" target="_blank">' . esc_html__( 'New User Primer', 'the-events-calendar' ) . '</a>';
 
 			$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,47 +1436,47 @@ 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'
 						),
-                        '<strong><a href="https://m.tri.be/18je" target="_blank">' . esc_html__( 'Settings overview', 'the-events-calendar' ) . '</a></strong>'
+                        '<strong><a href="https://evnt.is/18je" target="_blank">' . esc_html__( 'Settings overview', 'the-events-calendar' ) . '</a></strong>'
 					),
 
 					sprintf(
 						__(
 							'%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'
 						),
-                        '<strong><a href="https://m.tri.be/18jc" target="_blank">' . esc_html__( 'Features overview', 'the-events-calendar' ) . '</a></strong>'
+                        '<strong><a href="https://evnt.is/18jc" target="_blank">' . esc_html__( 'Features overview', 'the-events-calendar' ) . '</a></strong>'
 					),
 
 					sprintf(
 						__(
 							'%s: Our most comprehensive outline for customizing the calendar to suit your needs, including custom layouts and styles.',
 							'the-events-calendar'
 						),
-                        '<strong><a href="https://m.tri.be/18jg" target="_blank">' . esc_html__( "Themer's Guide", 'the-events-calendar' ) . '</a></strong>'
+                        '<strong><a href="https://evnt.is/18jg" target="_blank">' . esc_html__( "Themer's Guide", 'the-events-calendar' ) . '</a></strong>'
 					),
 
 					sprintf(
 						__(
 							'%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'
 						),
-                        '<strong><a href="https://m.tri.be/18jd" target="_blank">' . esc_html__( 'Using stylesheets and page templates', 'the-events-calendar' ) . '</a></strong>'
+                        '<strong><a href="https://evnt.is/18jd" target="_blank">' . esc_html__( 'Using stylesheets and page templates', 'the-events-calendar' ) . '</a></strong>'
 					),
 
 					sprintf(
 						__(
 							'%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'
 						),
-                        '<strong><a href="https://m.tri.be/18jb" target="_blank">' . esc_html__( 'Troubleshooting common problems', 'the-events-calendar' ) . '</a></strong>'
+                        '<strong><a href="https://evnt.is/18jb" target="_blank">' . esc_html__( 'Troubleshooting common problems', 'the-events-calendar' ) . '</a></strong>'
 					),
 
 					sprintf(
 						__(
 							'%s: Code and guides for customizing your calendar in useful and interesting ways.',
 							'the-events-calendar'
 						),
-                        '<strong><a href="https://m.tri.be/18ja" target="_blank">' . esc_html__( 'Customizing the Events plugins', 'the-events-calendar' ) . '</a></strong>'
+                        '<strong><a href="https://evnt.is/18ja" target="_blank">' . esc_html__( 'Customizing the Events plugins', 'the-events-calendar' ) . '</a></strong>'
 					),
 				],
                 15
@@ -1497,21 +1497,21 @@ public function add_help_section_extra_content( $help ) {
 				$link_et = '<a href="https://wordpress.org/support/plugin/event-tickets/" target="_blank">' . esc_html__( 'Events Tickets', 'the-events-calendar' ) . '</a>';
 				$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 = '<a href="https://m.tri.be/4w/" target="_blank">' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . '</a>';
+				$link = '<a href="https://evnt.is/4w/" target="_blank">' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . '</a>';
 				$help->add_section_content( 'extra-help', sprintf( __( '<strong>Looking for more immediate support?</strong> 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' ] ) ) {
 
 				$link = '<a href="https://wordpress.org/support/plugin/the-events-calendar" target="_blank">' . esc_html__( 'open-source forum on WordPress.org', 'the-events-calendar' ) . '</a>';
 				$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 = '<a href="https://m.tri.be/4w/" target="_blank">' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . '</a>';
-				$link_plus = '<a href="https://m.tri.be/18n0" target="_blank">' . esc_html__( 'Events Calendar PRO', 'the-events-calendar' ) . '</a>';
+				$link_forum = '<a href="https://evnt.is/4w/" target="_blank">' . esc_html__( 'premium support on our website', 'the-events-calendar' ) . '</a>';
+				$link_plus = '<a href="https://evnt.is/18n0" target="_blank">' . esc_html__( 'Events Calendar PRO', 'the-events-calendar' ) . '</a>';
 				$help->add_section_content( 'extra-help', sprintf( __( '<strong>Looking for more immediate support?</strong> 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 = '<a href="https://m.tri.be/4w/" target="_blank">' . esc_html__( 'post a thread', 'the-events-calendar' ) . '</a>';
+				$link = '<a href="https://evnt.is/4w/" target="_blank">' . esc_html__( 'post a thread', 'the-events-calendar' ) . '</a>';
 				$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;

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':

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'] );
 		}

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 );

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 ];

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'] != ''

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' );
 	}