From b3bc2f2772a97eca51ede409e4a106fa6ebc29fd Mon Sep 17 00:00:00 2001 From: Cooper Dalrymple Date: Wed, 19 Aug 2026 12:28:56 -0500 Subject: [PATCH 1/2] Disable captcha on nested forms --- inc/gravityforms/class-addon.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/inc/gravityforms/class-addon.php b/inc/gravityforms/class-addon.php index 4ddead8..670934f 100644 --- a/inc/gravityforms/class-addon.php +++ b/inc/gravityforms/class-addon.php @@ -116,9 +116,19 @@ final class Addon extends GFAddOn { } public function is_enabled(array|null $form = null): bool { + // Check to make sure that we're enabled on the plugin level first $plugin_enabled = $this->get_plugin_setting('enabled') === '1'; if (is_null($form) || !$plugin_enabled) return $plugin_enabled; + + $form_id = !is_null($form) ? absint(rgar($form, 'id')) : 0; + + // If Gravity Perks Nested Forms is active and the current form is nested, disable entirely (it's not compatible at the moment) + if (class_exists('GP_Nested_Forms')) { + $gp_nested_forms = GP_Nested_Forms::get_instance(); + if ($gp_nested_forms->is_nested_form_submission() && $gp_nested_forms->get_parent_form_id() !== $form_id) return false; + } + // Now check to see if the opt-out is enabled within the form settings $form_settings = $this->get_form_settings($form); $form_disabled = (bool) rgar($form_settings, 'disabled'); return !$form_disabled; @@ -160,7 +170,11 @@ final class Addon extends GFAddOn { if ($context != 'form-submit') return $validation_result; $form = $validation_result['form']; + + // Make sure that we are actually processing the end of the form if (!GFFormDisplay::is_last_page($form) || rgpost('action') == 'heartbeat') return $validation_result; + + // Make sure that we are connected and enabled if (!Settings::is_connected() || !$this->is_enabled($form)) return $validation_result; $errors = API::process(Widget::get_token()); From 714af0515a5c6da8cbee8e13c8671b9e8ced34e6 Mon Sep 17 00:00:00 2001 From: Cooper Dalrymple Date: Wed, 19 Aug 2026 12:28:58 -0500 Subject: [PATCH 2/2] Push version to 1.2.8 --- composer.json | 2 +- inc/gravityforms/class-addon.php | 2 +- ogre-captcha.php | 2 +- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 5 ++++- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index ffcf9a9..b6c1a4d 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "$schema": "https://getcomposer.org/schema.json", "name": "cleverogre/ogre-captcha", - "version": "1.2.7", + "version": "1.2.8", "title": "Ogre CAPTCHA", "description": "Protect your site with CAPTCHA", "author": "CleverOgre", diff --git a/inc/gravityforms/class-addon.php b/inc/gravityforms/class-addon.php index 670934f..32b120c 100644 --- a/inc/gravityforms/class-addon.php +++ b/inc/gravityforms/class-addon.php @@ -4,7 +4,7 @@ * @author cleverogre * @copyright 2026 CleverOgre * @license GLP-3.0-or-later - * @version 1.2.7 + * @version 1.2.8 * @since 1.1.0 */ diff --git a/ogre-captcha.php b/ogre-captcha.php index 6f5685b..6c5c6b3 100644 --- a/ogre-captcha.php +++ b/ogre-captcha.php @@ -13,7 +13,7 @@ * Plugin Name: Ogre CAPTCHA * Plugin URI: https://git.cleverogre.com/cleverogre/ogre-captcha/ * Description: Protect your site with CAPTCHA - * Version: 1.2.7 + * Version: 1.2.8 * Requires at least: 6.0 * Requires PHP: 8.2 * Author: CleverOgre diff --git a/package-lock.json b/package-lock.json index ba671e6..8aafd9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cleverogre/ogre-captcha", - "version": "1.2.6", + "version": "1.2.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cleverogre/ogre-captcha", - "version": "1.2.6", + "version": "1.2.7", "license": "GPL-3.0+", "devDependencies": { "gulp": "^5.0.0", diff --git a/package.json b/package.json index 74abd5f..438daf2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "$schema": "https://www.schemastore.org/package.json", "name": "cleverogre/ogre-captcha", - "version": "1.2.7", + "version": "1.2.8", "title": "Ogre CAPTCHA", "description": "Protect your site with CAPTCHA", "author": "CleverOgre", diff --git a/readme.txt b/readme.txt index 23df448..9977b7f 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: ogrecooper, cleverogre Tested up to: 7.0 Requires at least: 6.0 Requires PHP: 8.2 -Version: 1.2.7 +Version: 1.2.8 License: GPLv3 or later License URI: https://www.gnu.org/licenses/gpl-3.0.html Copyright: CleverOgre @@ -28,6 +28,9 @@ If you don't know what plugin you have downloaded, please contact [CleverOgre](t == Changelog == += 1.2.8 - 2026-08-19 = +* Fix compatibility issue with Gravity Perks Nested Forms + = 1.2.7 - 2026-08-14 = * Remove duplicate settings link * Add Gravity Forms section to settings page