← All changes | classes/controllers/FrmSimpleBlocksController.php +13 -37 6.25 → 6.8 View file →

		@@ -32,32 +32,24 @@
32	32	if ( $block_name === 'Formidable' ) {
33	33	$block_name = 'Formidable Forms';
34	34	}
35	35
36		- $modal_addon = self::get_addon_info( 185013 );
37		- $charts_addon = self::get_addon_info( 28248560 );
38		- $views_addon = FrmAddonsController::get_addon( 'views' );
39		- $views_addon_info = self::get_addon_info( 28027505 );
	36	+ $modal_addon = self::get_addon_info( 185013 );
	37	+ $charts_addon = self::get_addon_info( 28248560 );
40	38
41	39	$script_vars = array(
42		- 'forms' => self::get_forms_options(),
43		- 'icon' => $icon,
44		- 'name' => $block_name,
45		- 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
46		- 'url' => FrmAppHelper::plugin_url(),
47		- 'modalAddon' => array(
48		- 'link' => is_array( $modal_addon ) && isset( $modal_addon['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ) : '',
49		- 'hasAccess' => is_array( $modal_addon ) && ! empty( $modal_addon['url'] ),
	40	+ 'forms' => self::get_forms_options(),
	41	+ 'icon' => $icon,
	42	+ 'name' => $block_name,
	43	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block' ),
	44	+ 'url' => FrmAppHelper::plugin_url(),
	45	+ 'modalAddon' => array(
	46	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ),
	47	+ 'hasAccess' => ! empty( $modal_addon['url'] ),
50	48	),
51		- 'viewsAddon' => array(
52		- 'link' => is_array( $views_addon_info ) && isset( $views_addon_info['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $views_addon_info['link'] ) : '',
53		- 'hasAccess' => is_array( $views_addon_info ) && ! empty( $views_addon_info['url'] ),
54		- 'url' => ! empty( $views_addon_info['url'] ) ? $views_addon_info['url'] : '',
55		- 'installed' => is_array( $views_addon ) && 'installed' === $views_addon['status']['type'],
56		- ),
57	49	'chartsAddon' => array(
58		- 'link' => is_array( $charts_addon ) && isset( $charts_addon['link'] ) ? FrmAppHelper::admin_upgrade_link( 'block', $charts_addon['link'] ) : '',
59		- 'hasAccess' => is_array( $charts_addon ) && ! empty( $charts_addon['url'] ),
	50	+ 'link' => FrmAppHelper::admin_upgrade_link( 'block', $charts_addon['link'] ),
	51	+ 'hasAccess' => ! empty( $charts_addon['url'] ),
60	52	'installed' => class_exists( 'FrmChartsAppController' ),
61	53	),
62	54	);
63	55
		@@ -181,10 +173,8 @@
181	173	if ( ! isset( $attributes['formId'] ) ) {
182	174	return '';
183	175	}
184	176
185		- ob_start();
186		-
187	177	/**
188	178	* @since 5.5.2
189	179	* @param array $attributes
190	180	*/
		@@ -189,27 +179,13 @@
189	179	* @param array $attributes
190	180	*/
191	181	do_action( 'frm_before_simple_form_render', $attributes );
192	182
193		- $form = ob_get_clean();
194		-
195		- if ( false === $form ) {
196		- $form = '';
197		- }
198		-
199	183	$params = array_filter( $attributes );
200	184	$params['id'] = $params['formId'];
201	185	unset( $params['formId'] );
202	186
203		- // Still pass false for title and description options if nothing is set,
204		- // so a default doesn't overwrite the block option.
205		- $params['title'] = ! empty( $params['title'] );
206		- $params['description'] = ! empty( $params['description'] );
207		-
208		- $form .= FrmFormsController::get_form_shortcode( $params );
209		- if ( ! empty( $attributes['className'] ) ) {
210		- $form = preg_replace( '/\bfrm_forms\b/', 'frm_forms ' . esc_attr( $attributes['className'] ), $form, 1 );
211		- }
	187	+ $form = FrmFormsController::get_form_shortcode( $params );
212	188	return self::maybe_remove_fade_on_load_for_block_preview( $form );
213	189	}
214	190
215	191	/**