| @@ -44,20 +44,20 @@ | ||
| 44 | 44 | 'name' => $block_name, |
| 45 | 45 | 'link' => FrmAppHelper::admin_upgrade_link( 'block' ), |
| 46 | 46 | 'url' => FrmAppHelper::plugin_url(), |
| 47 | 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'] ), | |
| 48 | + 'link' => FrmAppHelper::admin_upgrade_link( 'block', $modal_addon['link'] ), | |
| 49 | + 'hasAccess' => ! empty( $modal_addon['url'] ), | |
| 50 | 50 | ), |
| 51 | 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'] ), | |
| 52 | + 'link' => FrmAppHelper::admin_upgrade_link( 'block', $views_addon_info['link'] ), | |
| 53 | + 'hasAccess' => ! empty( $views_addon_info['url'] ), | |
| 54 | 54 | 'url' => ! empty( $views_addon_info['url'] ) ? $views_addon_info['url'] : '', |
| 55 | - 'installed' => is_array( $views_addon ) && 'installed' === $views_addon['status']['type'], | |
| 55 | + 'installed' => 'installed' === $views_addon['status']['type'], | |
| 56 | 56 | ), |
| 57 | 57 | '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'] ), | |
| 58 | + 'link' => FrmAppHelper::admin_upgrade_link( 'block', $charts_addon['link'] ), | |
| 59 | + 'hasAccess' => ! empty( $charts_addon['url'] ), | |
| 60 | 60 | 'installed' => class_exists( 'FrmChartsAppController' ), |
| 61 | 61 | ), |
| 62 | 62 | ); |
| 63 | 63 | |
| @@ -181,10 +181,8 @@ | ||
| 181 | 181 | if ( ! isset( $attributes['formId'] ) ) { |
| 182 | 182 | return ''; |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - ob_start(); | |
| 186 | - | |
| 187 | 185 | /** |
| 188 | 186 | * @since 5.5.2 |
| 189 | 187 | * @param array $attributes |
| 190 | 188 | */ |
| @@ -189,27 +187,13 @@ | ||
| 189 | 187 | * @param array $attributes |
| 190 | 188 | */ |
| 191 | 189 | do_action( 'frm_before_simple_form_render', $attributes ); |
| 192 | 190 | |
| 193 | - $form = ob_get_clean(); | |
| 194 | - | |
| 195 | - if ( false === $form ) { | |
| 196 | - $form = ''; | |
| 197 | - } | |
| 198 | - | |
| 199 | 191 | $params = array_filter( $attributes ); |
| 200 | 192 | $params['id'] = $params['formId']; |
| 201 | 193 | unset( $params['formId'] ); |
| 202 | 194 | |
| 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 | - } | |
| 195 | + $form = FrmFormsController::get_form_shortcode( $params ); | |
| 212 | 196 | return self::maybe_remove_fade_on_load_for_block_preview( $form ); |
| 213 | 197 | } |
| 214 | 198 | |
| 215 | 199 | /** |
