From d8a7c26921ad75819ca3013949371df002a6fd25 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Wed, 19 Aug 2026 16:15:32 -0300
Subject: [PATCH 1/4] Add a few optimizations

---
 classes/controllers/FrmHooksController.php    |  2 +-
 classes/factories/FrmFieldFactory.php         | 12 ++++-
 classes/helpers/FrmAppHelper.php              |  2 +-
 classes/helpers/FrmFormsHelper.php            | 49 +++++++++++++++++++
 classes/helpers/FrmFormsListHelper.php        | 41 +++-------------
 classes/models/FrmMigrate.php                 | 24 +++++++++
 .../FrmPayPalLiteHooksController.php          |  8 ++-
 .../FrmSquareLiteHooksController.php          |  8 ++-
 .../FrmStrpLiteHooksController.php            | 25 +++++++++-
 .../FrmTransLiteHooksController.php           |  9 ++--
 10 files changed, 136 insertions(+), 44 deletions(-)

diff --git a/classes/controllers/FrmHooksController.php b/classes/controllers/FrmHooksController.php
index 932cae769c..ee50affb10 100644
--- a/classes/controllers/FrmHooksController.php
+++ b/classes/controllers/FrmHooksController.php
@@ -86,7 +86,7 @@ public static function load_hooks() {
 		add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
 
 		// Clear embed posts transient when posts are updated.
-		add_action( 'wp_insert_post', 'FrmFormsListHelper::maybe_clear_embed_posts_transient', 10, 2 );
+		add_action( 'wp_insert_post', 'FrmFormsHelper::maybe_clear_embed_posts_transient', 10, 2 );
 
 		// Form Shortcodes.
 		add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
diff --git a/classes/factories/FrmFieldFactory.php b/classes/factories/FrmFieldFactory.php
index 8469442693..335a0a9532 100644
--- a/classes/factories/FrmFieldFactory.php
+++ b/classes/factories/FrmFieldFactory.php
@@ -85,6 +85,15 @@ public static function get_field_type( $field_type, $field = 0 ) {
 	 * @return string
 	 */
 	private static function get_field_type_class( $field_type ) {
+		// Rendering one form calls this three times per field, so build the map once per request.
+		// The frm_get_field_type_class filter still runs on every call, since add-ons can register
+		// it after the first lookup has already happened.
+		static $type_classes = null;
+
+		if ( null !== $type_classes ) {
+			return apply_filters( 'frm_get_field_type_class', $type_classes[ $field_type ] ?? '', $field_type );
+		}
+
 		$type_classes = array(
 			'text'                         => 'FrmFieldText',
 			'textarea'                     => 'FrmFieldTextarea',
@@ -105,7 +114,8 @@ private static function get_field_type_class( $field_type ) {
 			'address'                      => 'FrmFieldAddress',
 			// Submit button field.
 			FrmSubmitHelper::FIELD_TYPE    => 'FrmFieldSubmit',
-			FrmFieldGdprHelper::FIELD_TYPE => FrmFieldGdprHelper::get_gdpr_field_class( $field_type ),
+			// get_gdpr_field_class only returns a class for the GDPR type, which is this entry's key.
+			FrmFieldGdprHelper::FIELD_TYPE => FrmFieldGdprHelper::get_gdpr_field_class( FrmFieldGdprHelper::FIELD_TYPE ),
 			'product'                      => 'FrmFieldProduct',
 			'quantity'                     => 'FrmFieldQuantity',
 			'total'                        => 'FrmFieldTotal',
diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 7d1532ea75..22f54185c0 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -10,7 +10,7 @@ class FrmAppHelper {
 	 *
 	 * @var int
 	 */
-	public static $db_version = 106;
+	public static $db_version = 107;
 
 	/**
 	 * Used by the API add-on.
diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php
index a4749e02a4..f958e31421 100644
--- a/classes/helpers/FrmFormsHelper.php
+++ b/classes/helpers/FrmFormsHelper.php
@@ -5,6 +5,19 @@
 
 class FrmFormsHelper {
 
+	/**
+	 * The transient name that stores data for which posts a form is embedded in.
+	 *
+	 * It lives here rather than in FrmFormsListHelper so the invalidation callback below can run
+	 * without autoloading that admin list table on a front end post insert.
+	 *
+	 * @since 6.32
+	 * @since 6.35 Moved here from FrmFormsListHelper.
+	 *
+	 * @var string
+	 */
+	const EMBED_POSTS_TRANSIENT = 'frm_posts_contain_form';
+
 	/**
 	 * Store and re-use field type data for the insert_opt_html function (to avoid multiple calls to FrmField::all_field_selection).
 	 *
@@ -2205,4 +2218,40 @@ public static function get_form_name( $form, $length = 0 ) {
 
 		return FrmAppHelper::truncate( $form_name, $length );
 	}
+
+	/**
+	 * Maybe clear the embed posts transient.
+	 *
+	 * @since 6.32
+	 * @since 6.35 Moved here from FrmFormsListHelper.
+	 *
+	 * @param int     $post_id Post ID.
+	 * @param WP_Post $post    Post object.
+	 *
+	 * @return void
+	 */
+	public static function maybe_clear_embed_posts_transient( $post_id, $post ) {
+		if ( str_contains( $post->post_content, '[formidable ' ) || str_contains( $post->post_content, '<!-- wp:formidable/simple-form ' ) ) {
+			// New post contains the form shortcode, so clear the embed posts transient.
+			delete_transient( self::EMBED_POSTS_TRANSIENT );
+			return;
+		}
+
+		$cached_posts = get_transient( self::EMBED_POSTS_TRANSIENT );
+
+		if ( ! is_array( $cached_posts ) ) {
+			return;
+		}
+
+		// If the new post data of a cached post doesn't contain the Formidable forms, clear the transient.
+		foreach ( $cached_posts as $posts ) {
+			foreach ( $posts as $post_data ) {
+				if ( intval( $post_data->ID ) === intval( $post_id ) ) {
+					// This post contains the form shortcode before updating, so clear the embed posts transient.
+					delete_transient( self::EMBED_POSTS_TRANSIENT );
+					return;
+				}
+			}
+		}
+	}
 }
diff --git a/classes/helpers/FrmFormsListHelper.php b/classes/helpers/FrmFormsListHelper.php
index 664a65e1b4..a408211bfb 100644
--- a/classes/helpers/FrmFormsListHelper.php
+++ b/classes/helpers/FrmFormsListHelper.php
@@ -5,15 +5,6 @@
 
 class FrmFormsListHelper extends FrmListHelper {
 
-	/**
-	 * The transient name that stores data for which posts a form is embedded in.
-	 *
-	 * @since 6.32
-	 *
-	 * @var string
-	 */
-	private static $embed_posts_transient_name = 'frm_posts_contain_form';
-
 	/**
 	 * @var string
 	 */
@@ -612,7 +603,7 @@ function () use ( $posts ) {
 	 * @return array
 	 */
 	private function get_posts_contain_form( $form ) {
-		$cached_posts = get_transient( self::$embed_posts_transient_name );
+		$cached_posts = get_transient( FrmFormsHelper::EMBED_POSTS_TRANSIENT );
 
 		if ( isset( $cached_posts[ $form->id ] ) && is_array( $cached_posts[ $form->id ] ) ) {
 			return $cached_posts[ $form->id ];
@@ -653,7 +644,7 @@ private function get_posts_contain_form( $form ) {
 		}
 
 		$cached_posts[ $form->id ] = $posts;
-		set_transient( self::$embed_posts_transient_name, $cached_posts, DAY_IN_SECONDS );
+		set_transient( FrmFormsHelper::EMBED_POSTS_TRANSIENT, $cached_posts, DAY_IN_SECONDS );
 
 		return $posts;
 	}
@@ -734,9 +725,9 @@ private function query_posts_contain_form( $form ) {
 	}
 
 	/**
-	 * Maybe clear the embed posts transient.
+	 * @deprecated 6.35 Moved to FrmFormsHelper so a front end post insert does not have to load this admin list table.
 	 *
-	 * @since 6.32
+	 * @codeCoverageIgnore
 	 *
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
@@ -744,27 +735,7 @@ private function query_posts_contain_form( $form ) {
 	 * @return void
 	 */
 	public static function maybe_clear_embed_posts_transient( $post_id, $post ) {
-		if ( str_contains( $post->post_content, '[formidable ' ) || str_contains( $post->post_content, '<!-- wp:formidable/simple-form ' ) ) {
-			// New post contains the form shortcode, so clear the embed posts transient.
-			delete_transient( self::$embed_posts_transient_name );
-			return;
-		}
-
-		$cached_posts = get_transient( self::$embed_posts_transient_name );
-
-		if ( ! is_array( $cached_posts ) ) {
-			return;
-		}
-
-		// If the new post data of a cached post doesn't contain the Formidable forms, clear the transient.
-		foreach ( $cached_posts as $posts ) {
-			foreach ( $posts as $post_data ) {
-				if ( intval( $post_data->ID ) === intval( $post_id ) ) {
-					// This post contains the form shortcode before updating, so clear the embed posts transient.
-					delete_transient( self::$embed_posts_transient_name );
-					return;
-				}
-			}
-		}
+		_deprecated_function( __METHOD__, '6.35', 'FrmFormsHelper::maybe_clear_embed_posts_transient' );
+		FrmFormsHelper::maybe_clear_embed_posts_transient( $post_id, $post );
 	}
 }
diff --git a/classes/models/FrmMigrate.php b/classes/models/FrmMigrate.php
index cee115c6da..bbe068a8a8 100644
--- a/classes/models/FrmMigrate.php
+++ b/classes/models/FrmMigrate.php
@@ -292,6 +292,7 @@ private function create_tables() {
 	 * @since 6.6
 	 * @since 6.16.3 idx_form_id_is_draft was also added to frm_items.
 	 * @since 6.17 idx_form_id_type was also added to frm_fields.
+	 * @since 6.35 idx_form_id_is_draft_created_at was added to frm_items, and idx_parent_form_id to frm_forms.
 	 *
 	 * @return void
 	 */
@@ -325,6 +326,29 @@ private function add_composite_indexes_for_entries() {
 		if ( ! self::index_exists( $table_name, $index_name ) ) {
 			$wpdb->query( "CREATE INDEX idx_form_id_type ON `{$wpdb->prefix}frm_fields` (form_id, type(30))" );
 		}
+
+		/**
+		 * Entry lists and Views filter on form_id plus is_draft and then sort by created_at.
+		 * Without created_at in the index the database sorts the whole matching set, so on a
+		 * form with tens of thousands of entries the first page reads thousands of rows.
+		 */
+		$table_name = "{$wpdb->prefix}frm_items";
+		$index_name = 'idx_form_id_is_draft_created_at';
+
+		if ( ! self::index_exists( $table_name, $index_name ) ) {
+			$wpdb->query( "CREATE INDEX idx_form_id_is_draft_created_at ON `{$wpdb->prefix}frm_items` (form_id, is_draft, created_at)" );
+		}
+
+		/**
+		 * Repeaters and embedded forms look their child forms up by parent_form_id, which had
+		 * no index at all, so every lookup was a full scan of frm_forms.
+		 */
+		$table_name = "{$wpdb->prefix}frm_forms";
+		$index_name = 'idx_parent_form_id';
+
+		if ( ! self::index_exists( $table_name, $index_name ) ) {
+			$wpdb->query( "CREATE INDEX idx_parent_form_id ON `{$wpdb->prefix}frm_forms` (parent_form_id)" );
+		}
 	}
 
 	/**
diff --git a/paypal/controllers/FrmPayPalLiteHooksController.php b/paypal/controllers/FrmPayPalLiteHooksController.php
index 60408d4b0b..aefe95ec4e 100644
--- a/paypal/controllers/FrmPayPalLiteHooksController.php
+++ b/paypal/controllers/FrmPayPalLiteHooksController.php
@@ -14,7 +14,13 @@ public static function load_hooks() {
 
 		add_filter( 'frm_payment_gateways', 'FrmPayPalLiteAppController::add_gateway' );
 
-		add_action( 'init', 'FrmPayPalLiteConnectHelper::check_for_redirects' );
+		// Only hook this up on the OAuth return request. Registering it unconditionally made
+		// WordPress autoload FrmPayPalLiteConnectHelper on every front end page view.
+		// Paired with FrmPayPalLiteConnectHelper::user_landed_on_the_oauth_return_url, which
+		// checks the same query argument.
+		if ( isset( $_GET['frm_paypal_api_return_oauth'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			add_action( 'init', 'FrmPayPalLiteConnectHelper::check_for_redirects' );
+		}
 
 		// Use 20 so this happens after the Stripe add-on.
 		add_filter( 'frm_pro_show_card_callback', 'FrmPayPalLiteActionsController::maybe_show_card', 20, 2 );
diff --git a/square/controllers/FrmSquareLiteHooksController.php b/square/controllers/FrmSquareLiteHooksController.php
index 38a08f6595..f931aaf5b0 100644
--- a/square/controllers/FrmSquareLiteHooksController.php
+++ b/square/controllers/FrmSquareLiteHooksController.php
@@ -14,7 +14,13 @@ public static function load_hooks() {
 
 		add_filter( 'frm_payment_gateways', 'FrmSquareLiteAppController::add_gateway' );
 
-		add_action( 'init', 'FrmSquareLiteConnectHelper::check_for_redirects' );
+		// Only hook this up on the OAuth return request. Registering it unconditionally made
+		// WordPress autoload FrmSquareLiteConnectHelper on every front end page view.
+		// Paired with FrmSquareLiteConnectHelper::user_landed_on_the_oauth_return_url, which
+		// checks the same query argument.
+		if ( isset( $_GET['frm_square_api_return_oauth'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			add_action( 'init', 'FrmSquareLiteConnectHelper::check_for_redirects' );
+		}
 
 		// Use 20 so this happens after the Stripe add-on.
 		add_filter( 'frm_pro_show_card_callback', 'FrmSquareLiteActionsController::maybe_show_card', 20, 2 );
diff --git a/stripe/controllers/FrmStrpLiteHooksController.php b/stripe/controllers/FrmStrpLiteHooksController.php
index 14956f8885..cadf5b6c01 100644
--- a/stripe/controllers/FrmStrpLiteHooksController.php
+++ b/stripe/controllers/FrmStrpLiteHooksController.php
@@ -17,7 +17,12 @@ public static function load_hooks() {
 		// Actions.
 		add_action( 'frm_entry_form', 'FrmStrpLiteAuth::add_hidden_token_field' );
 		add_action( 'frm_enqueue_form_scripts', 'FrmStrpLiteActionsController::maybe_load_scripts' );
-		add_action( 'init', 'FrmStrpLiteConnectHelper::check_for_stripe_connect_webhooks' );
+
+		// Only hook this up on requests it can act on. Registering it unconditionally made
+		// WordPress autoload FrmStrpLiteConnectHelper on every front end page view.
+		if ( self::request_may_be_for_stripe_connect() ) {
+			add_action( 'init', 'FrmStrpLiteConnectHelper::check_for_stripe_connect_webhooks' );
+		}
 
 		// Filters.
 		add_filter( 'frm_saved_errors', 'FrmStrpLiteAppController::maybe_add_payment_error', 10, 2 );
@@ -52,6 +57,24 @@ function ( $form_col ) {
 		add_action( 'frm_form_classes', 'FrmStrpLiteLinkController::add_form_classes' );
 	}
 
+	/**
+	 * Could this request be a Stripe Connect return trip or one of the Connect AJAX actions?
+	 *
+	 * Used to keep FrmStrpLiteConnectHelper out of ordinary page views. The helper still runs
+	 * its own narrower checks, this only decides whether it is worth loading at all.
+	 *
+	 * @since 6.35
+	 *
+	 * @return bool
+	 */
+	private static function request_may_be_for_stripe_connect() {
+		// These two query arguments are also checked in FrmStrpLiteConnectHelper, by
+		// user_landed_on_the_return_url and user_landed_on_the_oauth_return_url.
+		// phpcs:disable WordPress.Security.NonceVerification.Recommended
+		return wp_doing_ajax() || isset( $_GET['frm_stripe_connect_return'] ) || isset( $_GET['frm_stripe_connect_return_oauth'] );
+		// phpcs:enable WordPress.Security.NonceVerification.Recommended
+	}
+
 	/**
 	 * @return void
 	 */
diff --git a/stripe/controllers/FrmTransLiteHooksController.php b/stripe/controllers/FrmTransLiteHooksController.php
index 49a2fb5c79..0865d52f4b 100755
--- a/stripe/controllers/FrmTransLiteHooksController.php
+++ b/stripe/controllers/FrmTransLiteHooksController.php
@@ -9,8 +9,6 @@ class FrmTransLiteHooksController {
 	 * @return void
 	 */
 	public static function load_hooks() {
-		add_action( 'frm_add_form_option_section', 'FrmSquareLiteActionsController::actions_js' );
-
 		// Exit early, let the Payments submodule handle everything.
 		if ( class_exists( 'FrmTransHooksController', false ) ) {
 			return;
@@ -19,7 +17,6 @@ public static function load_hooks() {
 		// Actions.
 		add_action( 'frm_payment_cron', 'FrmTransLiteAppController::run_payment_cron' );
 		add_filter( 'frm_registered_form_actions', 'FrmTransLiteActionsController::register_actions' );
-		add_action( 'frm_add_form_option_section', 'FrmTransLiteActionsController::actions_js' );
 		add_action( 'frm_trigger_payment_action', 'FrmTransLiteActionsController::trigger_action', 10, 3 );
 
 		// Filters.
@@ -38,6 +35,10 @@ public static function load_hooks() {
 	public static function load_admin_hooks() {
 		add_action( 'frm_disconnected_gateway', 'FrmTransLiteAppController::maybe_remove_payment_cron', 10, 2 );
 
+		// frm_add_form_option_section only fires while rendering the form settings page, so these
+		// belong here rather than in load_hooks.
+		add_action( 'frm_add_form_option_section', 'FrmSquareLiteActionsController::actions_js' );
+
 		if ( class_exists( 'FrmTransHooksController', false ) ) {
 			add_action( 'frm_pay_show_square_options', 'FrmTransLiteAppController::add_repeat_cadence_value' );
 
@@ -73,6 +74,8 @@ function () {
 			add_action( 'admin_print_styles', array( self::class, 'hide_collect_payment_action' ) );
 		}
 
+		add_action( 'frm_add_form_option_section', 'FrmTransLiteActionsController::actions_js' );
+
 		// Actions.
 		add_action( 'admin_menu', 'FrmTransLitePaymentsController::menu', 25 );
 		add_action( 'admin_head', 'FrmTransLiteListsController::add_list_hooks' );

From 856192efe09afbf91dacb78af195fe1cc5d24a37 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Wed, 19 Aug 2026 16:24:56 -0300
Subject: [PATCH 2/4] Revert factory changes

---
 classes/factories/FrmFieldFactory.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/classes/factories/FrmFieldFactory.php b/classes/factories/FrmFieldFactory.php
index 335a0a9532..8469442693 100644
--- a/classes/factories/FrmFieldFactory.php
+++ b/classes/factories/FrmFieldFactory.php
@@ -85,15 +85,6 @@ public static function get_field_type( $field_type, $field = 0 ) {
 	 * @return string
 	 */
 	private static function get_field_type_class( $field_type ) {
-		// Rendering one form calls this three times per field, so build the map once per request.
-		// The frm_get_field_type_class filter still runs on every call, since add-ons can register
-		// it after the first lookup has already happened.
-		static $type_classes = null;
-
-		if ( null !== $type_classes ) {
-			return apply_filters( 'frm_get_field_type_class', $type_classes[ $field_type ] ?? '', $field_type );
-		}
-
 		$type_classes = array(
 			'text'                         => 'FrmFieldText',
 			'textarea'                     => 'FrmFieldTextarea',
@@ -114,8 +105,7 @@ private static function get_field_type_class( $field_type ) {
 			'address'                      => 'FrmFieldAddress',
 			// Submit button field.
 			FrmSubmitHelper::FIELD_TYPE    => 'FrmFieldSubmit',
-			// get_gdpr_field_class only returns a class for the GDPR type, which is this entry's key.
-			FrmFieldGdprHelper::FIELD_TYPE => FrmFieldGdprHelper::get_gdpr_field_class( FrmFieldGdprHelper::FIELD_TYPE ),
+			FrmFieldGdprHelper::FIELD_TYPE => FrmFieldGdprHelper::get_gdpr_field_class( $field_type ),
 			'product'                      => 'FrmFieldProduct',
 			'quantity'                     => 'FrmFieldQuantity',
 			'total'                        => 'FrmFieldTotal',

From 63c89cdc7a07bba33680c3b4d433c2046fe68b23 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Wed, 19 Aug 2026 18:13:14 -0300
Subject: [PATCH 3/4] Migration fixes

---
 classes/helpers/FrmAppHelper.php |  2 +-
 classes/models/FrmMigrate.php    | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 22f54185c0..4de20dfa6f 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -10,7 +10,7 @@ class FrmAppHelper {
 	 *
 	 * @var int
 	 */
-	public static $db_version = 107;
+	public static $db_version = 108;
 
 	/**
 	 * Used by the API add-on.
diff --git a/classes/models/FrmMigrate.php b/classes/models/FrmMigrate.php
index bbe068a8a8..65c206f2a6 100644
--- a/classes/models/FrmMigrate.php
+++ b/classes/models/FrmMigrate.php
@@ -292,7 +292,7 @@ private function create_tables() {
 	 * @since 6.6
 	 * @since 6.16.3 idx_form_id_is_draft was also added to frm_items.
 	 * @since 6.17 idx_form_id_type was also added to frm_fields.
-	 * @since 6.35 idx_form_id_is_draft_created_at was added to frm_items, and idx_parent_form_id to frm_forms.
+	 * @since 6.35 idx_form_id_created_at was added to frm_items, and idx_parent_form_id to frm_forms.
 	 *
 	 * @return void
 	 */
@@ -328,15 +328,24 @@ private function add_composite_indexes_for_entries() {
 		}
 
 		/**
-		 * Entry lists and Views filter on form_id plus is_draft and then sort by created_at.
-		 * Without created_at in the index the database sorts the whole matching set, so on a
-		 * form with tens of thousands of entries the first page reads thousands of rows.
+		 * The entry list sorts one form's entries by created_at, without filtering on is_draft.
+		 * KEY form_id alone cannot satisfy that ORDER BY, so the database read every matching row
+		 * and sorted it: on a form with 50,000 entries the first page took about 100ms.
+		 *
+		 * The is_draft column is deliberately left out. Putting it between form_id and created_at
+		 * leaves created_at unusable for the sort whenever is_draft is unconstrained, which is
+		 * exactly how the entry list queries. Draft filtering is served by idx_form_id_is_draft.
 		 */
 		$table_name = "{$wpdb->prefix}frm_items";
-		$index_name = 'idx_form_id_is_draft_created_at';
+		$index_name = 'idx_form_id_created_at';
 
 		if ( ! self::index_exists( $table_name, $index_name ) ) {
-			$wpdb->query( "CREATE INDEX idx_form_id_is_draft_created_at ON `{$wpdb->prefix}frm_items` (form_id, is_draft, created_at)" );
+			$wpdb->query( "CREATE INDEX idx_form_id_created_at ON `{$wpdb->prefix}frm_items` (form_id, created_at)" );
+		}
+
+		// Superseded by idx_form_id_created_at above, which the entry list can actually use.
+		if ( self::index_exists( $table_name, 'idx_form_id_is_draft_created_at' ) ) {
+			$wpdb->query( "DROP INDEX idx_form_id_is_draft_created_at ON `{$wpdb->prefix}frm_items`" );
 		}
 
 		/**

From 1d31a35240148e5ad05a21a837798cc08ef0bc42 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Wed, 19 Aug 2026 18:19:29 -0300
Subject: [PATCH 4/4] Clean up mgiration

---
 classes/helpers/FrmAppHelper.php | 2 +-
 classes/models/FrmMigrate.php    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php
index 4de20dfa6f..22f54185c0 100644
--- a/classes/helpers/FrmAppHelper.php
+++ b/classes/helpers/FrmAppHelper.php
@@ -10,7 +10,7 @@ class FrmAppHelper {
 	 *
 	 * @var int
 	 */
-	public static $db_version = 108;
+	public static $db_version = 107;
 
 	/**
 	 * Used by the API add-on.
diff --git a/classes/models/FrmMigrate.php b/classes/models/FrmMigrate.php
index 65c206f2a6..85a3f23650 100644
--- a/classes/models/FrmMigrate.php
+++ b/classes/models/FrmMigrate.php
@@ -343,11 +343,6 @@ private function add_composite_indexes_for_entries() {
 			$wpdb->query( "CREATE INDEX idx_form_id_created_at ON `{$wpdb->prefix}frm_items` (form_id, created_at)" );
 		}
 
-		// Superseded by idx_form_id_created_at above, which the entry list can actually use.
-		if ( self::index_exists( $table_name, 'idx_form_id_is_draft_created_at' ) ) {
-			$wpdb->query( "DROP INDEX idx_form_id_is_draft_created_at ON `{$wpdb->prefix}frm_items`" );
-		}
-
 		/**
 		 * Repeaters and embedded forms look their child forms up by parent_form_id, which had
 		 * no index at all, so every lookup was a full scan of frm_forms.