From 817077a05176c95b91352a7bbb0fb5d64876ab42 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 18 Mar 2025 11:21:53 -0300 Subject: [PATCH] Remove old ajax submit compatibillty code --- classes/controllers/FrmFormsController.php | 2 +- classes/helpers/FrmFormsHelper.php | 26 ++++++++++--------- classes/views/frm-forms/settings-advanced.php | 20 +++++++------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index e4bcf89e89..2426608759 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -1708,7 +1708,7 @@ public static function form_classes( $form ) { self::add_js_validate_form_to_global_vars( $form ); } - if ( ! FrmFormsHelper::should_use_pro_for_ajax_submit() && FrmForm::is_ajax_on( $form ) ) { + if ( FrmForm::is_ajax_on( $form ) ) { echo ' frm_ajax_submit '; } } diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php index 0eb206e51a..f3decd5e67 100644 --- a/classes/helpers/FrmFormsHelper.php +++ b/classes/helpers/FrmFormsHelper.php @@ -1805,18 +1805,6 @@ public static function maybe_add_sanitize_url_attr( $url, $form_id ) { return str_replace( $original_query, $query, $url ); } - /** - * Check if Pro isn't up to date yet. - * If Pro is active but using a version earlier than v6.2 fallback to Pro for AJAX submit (so things don't all happen twice). - * - * @since 6.2 - * - * @return bool - */ - public static function should_use_pro_for_ajax_submit() { - return is_callable( 'FrmProForm::is_ajax_on' ) && ! is_callable( 'FrmProFormsHelper::lite_supports_ajax_submit' ); - } - /** * Outputs the appropriate button text in the publish box. * @@ -1872,4 +1860,18 @@ public static function actions_dropdown( $atts ) { $links = self::get_action_links( $form_id, $status ); include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/actions-dropdown.php'; } + + /** + * Check if Pro isn't up to date yet. + * If Pro is active but using a version earlier than v6.2 fallback to Pro for AJAX submit (so things don't all happen twice). + * + * @since 6.2 + * @deprecated x.x + * + * @return bool + */ + public static function should_use_pro_for_ajax_submit() { + _deprecated_function( __METHOD__, 'x.x' ); + return false; + } } diff --git a/classes/views/frm-forms/settings-advanced.php b/classes/views/frm-forms/settings-advanced.php index 4d2ac74758..9651926b63 100644 --- a/classes/views/frm-forms/settings-advanced.php +++ b/classes/views/frm-forms/settings-advanced.php @@ -107,17 +107,15 @@ - - - - - - - + + + + +