diff --git a/includes/Core/Form/Integrations/FluentForms.php b/includes/Core/Form/Integrations/FluentForms.php index d133085..35b87bc 100644 --- a/includes/Core/Form/Integrations/FluentForms.php +++ b/includes/Core/Form/Integrations/FluentForms.php @@ -26,7 +26,7 @@ class FluentForms extends AbstractIntegration { * Checking if Fluent Form plugin active or not */ public function boot() { - $this->is_active = defined( 'FLUENTFORM' ); + $this->is_active = function_exists( 'wpFluent' ); } /** @@ -38,6 +38,11 @@ public function boot() { public function forms() { $forms = wpFluent()->table( 'fluentform_forms' )->get(); + // Fluent Forms 6.x returns Collection, convert to array + if ( ! is_array( $forms ) && method_exists( $forms, 'toArray' ) ) { + $forms = $forms->toArray(); + } + return array_map( function ( $form ) { return array( diff --git a/includes/Core/Form/Integrations/Hooks.php b/includes/Core/Form/Integrations/Hooks.php index d4029d2..4d90707 100644 --- a/includes/Core/Form/Integrations/Hooks.php +++ b/includes/Core/Form/Integrations/Hooks.php @@ -18,7 +18,7 @@ public function __construct() { add_action( 'caldera_forms_submit_complete', array( CalderaForms::instance(), 'submit' ), 999, 4 ); add_action( 'weforms_entry_submission', array( Weforms::instance(), 'submit' ), 999, 4 ); add_action( 'nf_save_sub', array( NinjaForms::instance(), 'submit' ), 999, 1 ); - add_action( 'fluentform_before_insert_submission', array( FluentForms::instance(), 'submit' ), 999, 1 ); + add_action( 'fluentform/before_insert_submission', array( FluentForms::instance(), 'submit' ), 999, 1 ); add_action( 'happyforms_submission_success', array( HappyForms::instance(), 'submit' ), 999, 1 ); add_action( 'frm_after_entry_processed', array( FormidableForms::instance(), 'submit' ), 999, 1 ); add_action( 'wp_ajax_sgpb_process_after_submission', array( PopupBuilder::instance(), 'submit' ), 999, 1 );