ET-741, PRMTR-206, TCMN-47: Promoter Listeners improvements

.github/workflows/phpcs.yml

@@ -1,26 +1,26 @@
-#name: 'PHP CodeSniffer'
-#on:
-#  pull_request:
-#    paths:
-#      - 'src/**.php'
-#      - '*.php'
-#jobs:
-#  phpcs:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v1
-#        with:
-#          fetch-depth: 100
-#      - name: Get Composer Cache Directory
-#        id: composer-cache
-#        run: |
-#          echo "::set-output name=dir::$(composer config cache-files-dir)"
-#      - uses: actions/cache@v1
-#        with:
-#          path: ${{ steps.composer-cache.outputs.dir }}
-#          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-composer-
-#      - uses: moderntribe/action-tribe-phpcs@master
-#        with:
-#          github-bot-token: ${{ secrets.GH_BOT_TOKEN }}
+name: 'PHP CodeSniffer'
+on:
+  pull_request:
+    paths:
+      - 'src/**.php'
+      - '*.php'
+jobs:
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 100
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - uses: moderntribe/action-tribe-phpcs@master
+        with:
+          github-bot-token: ${{ secrets.GH_BOT_TOKEN }}

.gitignore

@@ -30,8 +30,9 @@ vendor/freemius/languages/*.po
 
 # Resources Ignoring
 src/resources/**/app
-src/resources/css/**
-src/resources/**/*.min.js
+src/resources/css
+src/resources/js/**/*.min.js
 
 # get from translate.wordpress.org as needed
 lang/*.po
+lang/*.mo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tribe-common",
-  "version": "4.11.3",
+  "version": "4.11.4",
   "repository": "git@github.com:moderntribe/tribe-common.git",
   "_resourcepath": "src/resources",
   "_domainPath": "lang",

readme.txt

@@ -2,13 +2,21 @@
 
 == Changelog ==
 
+= [TBD] TBD =
+
+* Added context to the country and the state of Georgia to allow separate translation [BTRIA-63]
+
+* Fix - Increase range of actions that trigger changes on Promoter with a `WP_Post` instance or using an ID. [TCMN-47]
+
 = [4.11.3] 2020-02-26 =
 
 * Fix - JavaScript error in tribe dialog when there are no dialogs. Change fallback from object to array. [TCMN-34]
 * Fix - Fix display of Dialogs in Safari 12 mobile. [ETP-155]
 * Fix - Bring back the dialog icons. [ETP-155]
 * Tweak - Add theme compatibility for the tribe dialog [ETP-156]
 
+* Tweak - Add check if in `the_content` filter to prevent it from being called again. [ECP-345]
+
 = [4.11.2.1] 2020-02-25 =
 
 * Fix - Plugin dependency registration with `Plugin_Register` will not prevent loading of all plugins in list if the last loaded fails. [TCMN-41]

src/Tribe/Languages/Locations.php

@@ -135,7 +135,7 @@ public function build_country_array() {
 			'TF' => esc_html__( 'French Southern Territories', 'tribe-common' ),
 			'GA' => esc_html__( 'Gabon', 'tribe-common' ),
 			'GM' => esc_html__( 'Gambia', 'tribe-common' ),
-			'GE' => esc_html__( 'Georgia', 'tribe-common' ),
+			'GE' => esc_html_x( 'Georgia', 'The country', 'tribe-common' ),
 			'DE' => esc_html__( 'Germany', 'tribe-common' ),
 			'GH' => esc_html__( 'Ghana', 'tribe-common' ),
 			'GI' => esc_html__( 'Gibraltar', 'tribe-common' ),
@@ -331,7 +331,7 @@ public function build_us_states_array() {
 			'DE' => esc_html__( 'Delaware', 'tribe-common' ),
 			'DC' => esc_html__( 'District of Columbia', 'tribe-common' ),
 			'FL' => esc_html__( 'Florida', 'tribe-common' ),
-			'GA' => esc_html__( 'Georgia', 'tribe-common' ),
+			'GA' => esc_html_x( 'Georgia', 'The US state Georgia','tribe-common' ),
 			'HI' => esc_html__( 'Hawaii', 'tribe-common' ),
 			'ID' => esc_html__( 'Idaho', 'tribe-common' ),
 			'IL' => esc_html__( 'Illinois', 'tribe-common' ),

src/Tribe/Log/File_Logger.php

@@ -27,7 +27,7 @@ protected function set_log_dir() {
 		 *
 		 * @var string $log_dir
 		 */
-		$this->log_dir = apply_filters( 'tribe_file_logger_directory', sys_get_temp_dir() );
+		$this->log_dir = apply_filters( 'tribe_file_logger_directory', get_temp_dir() );
 	}
 
 	/**

src/Tribe/Main.php

@@ -17,7 +17,7 @@ class Tribe__Main {
 	const OPTIONNAME          = 'tribe_events_calendar_options';
 	const OPTIONNAMENETWORK   = 'tribe_events_calendar_network_options';
 
-	const VERSION             = '4.11.3';
+	const VERSION             = '4.11.4';
 
 	const FEED_URL            = 'https://theeventscalendar.com/feed/';
 

src/Tribe/Promoter/Connector.php

@@ -192,7 +192,7 @@ public function notify_promoter_of_changes( $post_id ) {
 
 		$payload = [
 			'licenseKey' => $license_key,
-			'sourceId' => $post_id,
+			'sourceId' => $post_id instanceof WP_Post ? $post_id->ID : $post_id,
 		];
 
 		$token = \Firebase\JWT\JWT::encode( $payload, $secret_key );

src/functions/template-tags/post.php

@@ -30,14 +30,17 @@ function tribe_get_the_content( $more_link_text = null, $strip_teaser = false, $
 		$content = get_the_content( $more_link_text, $strip_teaser );
 	}
 
-	/**
-	 * Filters the post content.
-	 *
-	 * @since 0.71 of WordPress
-	 *
-	 * @param string $content Content of the current post.
-	 */
-	$content = apply_filters( 'the_content', $content );
+	if ( ! doing_filter( 'the_content' ) ) {
+		/**
+		 * Filters the post content.
+		 *
+		 * @since 0.71 of WordPress
+		 *
+		 * @param string $content Content of the current post.
+		 */
+		$content = apply_filters( 'the_content', $content );
+	}
+
 	$content = str_replace( ']]>', ']]>', $content );
 
 	$post = $previous_post;