Commit dd3be329 authored by Eric Windham's avatar Eric Windham

Merge branch 'issue#4029' into 'develop'

Removed shortcode from setting that was executing in render method for page builders.

Closes #4029

See merge request !3843
parents cb66f870 cb3d0872
Pipeline #2674 passed with stages
in 5 minutes and 29 seconds
......@@ -83,6 +83,9 @@ final class NF_Display_Render
unset( $settings[ $name ] );
}
// Remove the embed_form setting to avoid pagebuilder conflicts.
$settings[ 'embed_form' ] = '';
$settings = array_merge( Ninja_Forms::config( 'i18nFrontEnd' ), $settings );
$settings = apply_filters( 'ninja_forms_display_form_settings', $settings, $form_id );
......@@ -409,6 +412,8 @@ final class NF_Display_Render
$form[ 'settings' ] = array_merge( Ninja_Forms::config( 'i18nFrontEnd' ), $form[ 'settings' ] );
$form[ 'settings' ] = apply_filters( 'ninja_forms_display_form_settings', $form[ 'settings' ], $form_id );
// Remove the embed_form setting to avoid pagebuilder conflicts.
$form[ 'settings' ][ 'embed_form' ] = '';
$form[ 'settings' ][ 'is_preview' ] = TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment