From 85b36356d8b07d2d012e905ab33748788e18875f Mon Sep 17 00:00:00 2001 From: Nic Ford Date: Fri, 28 Jun 2019 16:07:49 -0700 Subject: [PATCH 1/8] Open and close loop based on fl_builder_loop query settings --- pods-beaver-themer.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pods-beaver-themer.php b/pods-beaver-themer.php index c7d8919..935c069 100644 --- a/pods-beaver-themer.php +++ b/pods-beaver-themer.php @@ -52,8 +52,9 @@ function pods_beaver_init() { PodsBeaverPageData::init(); - // Beaver Themer sets up a "virtual reality" fake being in the Loop #15 for any module using FLBuilderLoop::query() - add_action( 'fl_builder_loop_before_query', 'pods_beaver_fake_loop_add_actions'); + // Fake being "in the loop" for any module using FLBuilderLoop::query() (see #15) + add_action( 'fl_builder_loop_before_query', 'pods_beaver_fake_loop_start'); + add_action( 'fl_builder_loop_after_query', 'pods_beaver_fake_loop_end'); // Priority 0 to run before FLThemeBuilderRulesLocation::set_preview_query() - Beaver Themer // add_action( 'wp_enqueue_scripts', 'pods_beaver_enqueue_assets', 0 ); @@ -113,10 +114,20 @@ function pods_beaver_enqueue_assets() { * * @since 1.1.1 */ -function pods_beaver_fake_loop_add_actions() { +function pods_beaver_fake_loop_start() { - add_action( 'loop_start', 'pods_beaver_fake_loop_true'); - add_action( 'loop_end', 'pods_beaver_fake_loop_false'); + add_action( 'fl_builder_loop_before_query', 'pods_beaver_fake_loop_true'); + +} + +/** + * Register functions to fake the loop. + * + * @since 1.1.1 + */ +function pods_beaver_fake_loop_end() { + + add_action( 'fl_builder_loop_after_query', 'pods_beaver_fake_loop_false'); } @@ -132,7 +143,7 @@ function pods_beaver_fake_loop_true() { global $wp_query; - // Fake being in the loop. + // Fake being in the loop. $wp_query->in_the_loop = true; } @@ -152,10 +163,6 @@ function pods_beaver_fake_loop_false() { // Stop faking being in the loop. $wp_query->in_the_loop = false; - // cleanup - keep fake as close to beaver as possible - remove_action( 'loop_start', 'pods_beaver_fake_loop_true'); - remove_action( 'loop_end', 'pods_beaver_fake_loop_false'); - } /** From 6a106fa7085aec788d5c8d8ed67cc59d339c84b0 Mon Sep 17 00:00:00 2001 From: Nic Ford Date: Fri, 28 Jun 2019 16:13:49 -0700 Subject: [PATCH 2/8] Update function docs and version numbers --- pods-beaver-themer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pods-beaver-themer.php b/pods-beaver-themer.php index 935c069..2502381 100644 --- a/pods-beaver-themer.php +++ b/pods-beaver-themer.php @@ -110,9 +110,9 @@ function pods_beaver_enqueue_assets() { } /** - * Register functions to fake the loop. + * Register function to start the fake loop. * - * @since 1.1.1 + * @since 1.3.3 */ function pods_beaver_fake_loop_start() { @@ -121,9 +121,9 @@ function pods_beaver_fake_loop_start() { } /** - * Register functions to fake the loop. + * Register function to end the fake loop. * - * @since 1.1.1 + * @since 1.3.3 */ function pods_beaver_fake_loop_end() { From 21cb0ba5b03db7e248fc667010faf2ef79cdace6 Mon Sep 17 00:00:00 2001 From: Jory Hogeveen Date: Fri, 6 Mar 2020 15:24:30 +0100 Subject: [PATCH 3/8] Enhance detecting queried object Using object parameters isn't reliable since their parameters are sometimes the same --- classes/class-pods-beaver-page-data.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/class-pods-beaver-page-data.php b/classes/class-pods-beaver-page-data.php index d1b5e2b..27bdc31 100644 --- a/classes/class-pods-beaver-page-data.php +++ b/classes/class-pods-beaver-page-data.php @@ -50,16 +50,16 @@ public static function get_current_pod_info() { if ( $queried_object ) { $id_lookup = true; - if ( isset( $queried_object->post_type ) ) { + if ( $queried_object instanceof WP_Post ) { // Post Type Singular $info['pod'] = $queried_object->post_type; - } elseif ( isset( $queried_object->taxonomy ) ) { + } elseif ( $queried_object instanceof WP_Term ) { // Term Archive $info['pod'] = $queried_object->taxonomy; - } elseif ( isset( $queried_object->user_login ) ) { + } elseif ( $queried_object instanceof WP_User ) { // Author Archive $info['pod'] = 'user'; - } elseif ( isset( $queried_object->public ) && isset( $queried_object->name ) ) { + } elseif ( $queried_object instanceof WP_Post_Type ) { // Post Type Archive $info['pod'] = $queried_object->name; From 4269912f69a40e7ee45ad01bf915ebd001f004a7 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Mon, 30 Nov 2020 08:20:12 -0600 Subject: [PATCH 4/8] Hook into the admin_notices action for required message --- pods-beaver-themer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pods-beaver-themer.php b/pods-beaver-themer.php index a8207da..74049b1 100644 --- a/pods-beaver-themer.php +++ b/pods-beaver-themer.php @@ -3,7 +3,7 @@ * Plugin Name: Pods Beaver Themer Add-On * Plugin URI: http://pods.io/ * Description: Integration with Beaver Builder Themer (https://www.wpbeaverbuilder.com). Provides a UI for mapping Field Connections with Pods - * Version: 1.3.3 + * Version: 1.3.4 * Author: Quasel, Pods Framework Team * Author URI: http://pods.io/about/ * Text Domain: pods-beaver-builder-themer-add-on @@ -30,7 +30,7 @@ * @package Pods\Beaver Themer */ -define( 'PODS_BEAVER_VERSION', '1.3.3' ); +define( 'PODS_BEAVER_VERSION', '1.3.4' ); define( 'PODS_BEAVER_FILE', __FILE__ ); define( 'PODS_BEAVER_DIR', plugin_dir_path( PODS_BEAVER_FILE ) ); define( 'PODS_BEAVER_URL', plugin_dir_url( PODS_BEAVER_FILE ) ); @@ -83,14 +83,14 @@ function pods_beaver_admin_nag() { if ( is_admin() && ( ! class_exists( 'FLBuilder' ) || ! defined( 'PODS_VERSION' ) ) ) { printf( - '

%s

', + '

%s

', esc_html__( 'Pods Beaver Themer requires that the Pods and Beaver Builder Themer plugins be installed and activated.', 'pods-beaver-builder-themer-add-on' ) ); } } -add_action( 'plugins_loaded', 'pods_beaver_admin_nag' ); +add_action( 'admin_notices', 'pods_beaver_admin_nag' ); /** * Post modules: JS for setting data_source to custom_query if a relationship field is selected as source From 8d24d1d1b072247cb239bd764b39e17f81ec2365 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Mon, 30 Nov 2020 08:21:51 -0600 Subject: [PATCH 5/8] Update readme.txt --- readme.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index db89bb7..e158163 100755 --- a/readme.txt +++ b/readme.txt @@ -3,9 +3,9 @@ Contributors: quasel, sc0ttkclark, jimtrue, smarterdigitalltd Donate link: https://pods.io/friends-of-pods/ Tags: pods, beaver builder, beaver themer Requires at least: 4.4 -Tested up to: 5.4 +Tested up to: 5.5 Requires PHP: 5.4 -Stable tag: 1.3.3 +Stable tag: 1.3.4 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -72,6 +72,9 @@ You can use [GitHub Updater](https://github.com/afragen/github-updater). A simpl == Changelog == += 1.3.4 - November 30th, 2020 = +* Fixed: Admin notices are now using the correct action for showing the message that Pods and Beaver Themer plugins (if not available) are required to use this plugin. + = 1.3.3 - March 26th, 2020 = * Added: Now requiring PHP 5.4+ * Added: Freemius support when running Pods 2.7.17 From 9cc6177841caf7777337cebd2dc174be53e9d4a7 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Wed, 30 Dec 2020 08:49:22 -0600 Subject: [PATCH 6/8] Update readme.txt --- readme.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index e158163..fdcfbde 100755 --- a/readme.txt +++ b/readme.txt @@ -72,8 +72,9 @@ You can use [GitHub Updater](https://github.com/afragen/github-updater). A simpl == Changelog == -= 1.3.4 - November 30th, 2020 = -* Fixed: Admin notices are now using the correct action for showing the message that Pods and Beaver Themer plugins (if not available) are required to use this plugin. += 1.3.4 - December 30th, 2020 = +* Fixed: Admin notices are now using the correct action for showing the message that Pods and Beaver Themer plugins (if not available) are required to use this plugin. #110 +* Fixed: Properly set post type parameter (if we have it) to fix issues with Polylang and other plugin compatibility. #109 = 1.3.3 - March 26th, 2020 = * Added: Now requiring PHP 5.4+ From 7231206a964aa33b219e4dd908dbbfbe367307e2 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Wed, 30 Dec 2020 08:49:46 -0600 Subject: [PATCH 7/8] Update tested version --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index fdcfbde..5f6f783 100755 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: quasel, sc0ttkclark, jimtrue, smarterdigitalltd Donate link: https://pods.io/friends-of-pods/ Tags: pods, beaver builder, beaver themer Requires at least: 4.4 -Tested up to: 5.5 +Tested up to: 5.6 Requires PHP: 5.4 Stable tag: 1.3.4 License: GPLv2 or later From 64e352884b073dd1aa826925f31825514dd1ebf4 Mon Sep 17 00:00:00 2001 From: Scott Kingsley Clark Date: Wed, 30 Dec 2020 08:52:40 -0600 Subject: [PATCH 8/8] Update and rename mt-code-review.yml to code-review.yml Fixes compat with new repo name --- .github/workflows/{mt-code-review.yml => code-review.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{mt-code-review.yml => code-review.yml} (78%) diff --git a/.github/workflows/mt-code-review.yml b/.github/workflows/code-review.yml similarity index 78% rename from .github/workflows/mt-code-review.yml rename to .github/workflows/code-review.yml index dd672a3..46fffb9 100644 --- a/.github/workflows/mt-code-review.yml +++ b/.github/workflows/code-review.yml @@ -1,4 +1,4 @@ -name: MT Code Review +name: Code Review on: pull_request: paths-ignore: @@ -12,6 +12,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - uses: moderntribe/action-tribe-phpcs@master + - uses: the-events-calendar/action-tribe-phpcs@master with: github-bot-token: ${{ secrets.GH_BOT_TOKEN }}