From db3dca991dea70763325a7f0680c9cdc8ad87f44 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 22 May 2024 13:47:16 -0300 Subject: [PATCH 1/4] Pro issue 5074 / Print media templates to fix email actions media button issue --- classes/controllers/FrmFormsController.php | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 49de781bdc..0cf7c39ecd 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -1229,9 +1229,11 @@ public static function maybe_update_form_builder_message( &$message ) { */ public static function get_settings_vars( $id, $errors = array(), $args = array() ) { FrmAppHelper::permission_check( 'frm_edit_forms' ); - + global $frm_vars; + self::maybe_print_media_templates(); + if ( ! is_array( $args ) ) { // For reverse compatibility. $args = array( @@ -1269,6 +1271,25 @@ public static function get_settings_vars( $id, $errors = array(), $args = array( require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings.php'; } + /** + * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked. + * + * @return void + */ + private static function maybe_print_media_templates() { + if ( FrmAppHelper::pro_is_included() ) { + // This issue does not exist when Pro is active so exit early. + return; + } + + add_action( + 'wp_enqueue_editor', + function() { + wp_print_media_templates(); + } + ); + } + /** * @since 4.0 */ From 30390198cf8f32205629ad1b16f3ecd9f69aee53 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 22 May 2024 13:47:59 -0300 Subject: [PATCH 2/4] Fix spacing change --- classes/controllers/FrmFormsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 0cf7c39ecd..81cc0be2d0 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -1229,7 +1229,7 @@ public static function maybe_update_form_builder_message( &$message ) { */ public static function get_settings_vars( $id, $errors = array(), $args = array() ) { FrmAppHelper::permission_check( 'frm_edit_forms' ); - + global $frm_vars; self::maybe_print_media_templates(); From 1f772c72ebe4fce02a3fcd920d076a1562022c1a Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 22 May 2024 13:48:26 -0300 Subject: [PATCH 3/4] Add a since comment --- classes/controllers/FrmFormsController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 81cc0be2d0..137c434265 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -1274,6 +1274,8 @@ public static function get_settings_vars( $id, $errors = array(), $args = array( /** * Print WordPress media templates email actions does not trigger a "Uncaught Error: Template not found: #tmpl-media-selection" error when the media button is clicked. * + * @since x.x + * * @return void */ private static function maybe_print_media_templates() { From 0232d0864781c33974fdd523d4bfb533e8c1d39c Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 22 May 2024 13:53:36 -0300 Subject: [PATCH 4/4] Fixing change (phpcs) --- classes/controllers/FrmFormsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 137c434265..f2ea29b285 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -1286,7 +1286,7 @@ private static function maybe_print_media_templates() { add_action( 'wp_enqueue_editor', - function() { + function () { wp_print_media_templates(); } );