Merge branch 'release/G22.nodosaurus.1'

the-events-calendar · Jul 13, 2022 · 7d58d1c · 7d58d1c
2 parents 1e83b33 + 94c16e4
commit 7d58d1c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,10 @@
 == Changelog ==
 
+= [5.4.2.1] 2022-07-12 =
+
+* Fix - Fixes compatibility with Elementor-based themes. [ET-1554]
+* Language - 0 new strings added, 1 updated, 0 fuzzied, and 0 obsoleted.
+
 = [5.4.2] 2022-07-05 =
 
 * Fix - Fixed changing of Shared Capacity stock when a single ticket stock is updated. [ETP-800]

diff --git a/event-tickets.php b/event-tickets.php
@@ -3,7 +3,7 @@
 Plugin Name: Event Tickets
 Plugin URI:  https://evnt.is/1acb
 Description: Event Tickets allows you to sell basic tickets and collect RSVPs from any post, page, or event.
-Version: 5.4.2
+Version: 5.4.2.1
 Author: The Events Calendar
 Author URI: https://evnt.is/1aor
 License: GPLv2 or later

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Contributors: theeventscalendar, brianjessee, camwynsp, aguseo, bordoni, borkweb
 Tags: tickets, registration, event registration, RSVP, ticket sales, attendee management
 Requires at least: 5.6
 Tested up to: 6.0
-Stable tag: 5.4.2
+Stable tag: 5.4.2.1
 Requires PHP: 7.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -188,6 +188,11 @@ Check out our extensive [knowledgebase](https://evnt.is/18wm) for articles on us
 
 == Changelog ==
 
+= [5.4.2.1] 2022-07-12 =
+
+* Fix - Fixes compatibility with Elementor-based themes. [ET-1554]
+* Language - 0 new strings added, 1 updated, 0 fuzzied, and 0 obsoleted.
+
 = [5.4.2] 2022-07-05 =
 
 * Enhancement - Unify CSS class names for many admin elements. [ET-1536]

diff --git a/src/Tribe/Editor/Compatibility/Tickets.php b/src/Tribe/Editor/Compatibility/Tickets.php
@@ -33,7 +33,11 @@ public function include_frontend_form( $content = '' ) {
 		}
 
 		// If edited via Elementor, return.
-		if ( class_exists( '\Elementor\Plugin' ) && \Elementor\Plugin::$instance->documents->get( get_the_ID() )->is_built_with_elementor() ) {
+		$post = get_post();
+		if ( $post instanceof WP_Post
+			 && class_exists( '\Elementor\Plugin' )
+			 && \Elementor\Plugin::$instance->documents->get( $post->ID )->is_built_with_elementor()
+		) {
 			return $content;
 		}
 
@@ -44,9 +48,6 @@ public function include_frontend_form( $content = '' ) {
 			return $content;
 		}
 
-		// Fetch the post.
-		$post = get_post( get_the_ID() );
-
 		// Return content if post is empty.
 		if ( empty( $post ) ) {
 			return $content;

diff --git a/src/Tribe/Main.php b/src/Tribe/Main.php
@@ -8,7 +8,7 @@ class Tribe__Tickets__Main {
 	/**
 	 * Current version of this plugin
 	 */
-	const VERSION = '5.4.2';
+	const VERSION = '5.4.2.1';
 
 	/**
 	 * Used to store the version history.