From b1a9c53cab32dd1d272941fbb056003cc325c00b Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 11 Mar 2025 10:03:28 -0300 Subject: [PATCH 1/5] Revert "Only localize scripts once" --- classes/helpers/FrmAppHelper.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index ef7d3a4e01..b2705b71bb 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -36,11 +36,6 @@ class FrmAppHelper { */ private static $included_svg = false; - /** - * @var array Keys are locations and values are true or false. - */ - private static $localized_script_locations = array(); - /** * @since 1.07.02 * @@ -3352,10 +3347,6 @@ public static function load_font_style() { * @return void */ public static function localize_script( $location ) { - if ( ! empty( self::$localized_script_locations[ $location ] ) ) { - return; - } - global $wp_scripts, $wp_version; $script_strings = array( @@ -3459,8 +3450,6 @@ public static function localize_script( $location ) { wp_localize_script( 'formidable_admin', 'frm_admin_js', $admin_script_strings ); } }//end if - - self::$localized_script_locations[ $location ] = true; } /** From 934c5df6eb550c7418c34cf59ce829b0d1f64169 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 11 Mar 2025 10:13:20 -0300 Subject: [PATCH 2/5] Update workflow --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0b6467e6b3..4f914403c5 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -11,7 +11,7 @@ name: PHPUnit jobs: build-test: if: contains(github.event.pull_request.labels.*.name, 'run tests') - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: WP_MULTISITE: ${{ matrix.multisite }} strategy: From 98548f30703dcc886188732a937d894d2e39207b Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 11 Mar 2025 11:17:12 -0300 Subject: [PATCH 3/5] Try to fix unit test --- classes/helpers/FrmFormTemplatesHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/helpers/FrmFormTemplatesHelper.php b/classes/helpers/FrmFormTemplatesHelper.php index a3714e277d..75cbd3265f 100644 --- a/classes/helpers/FrmFormTemplatesHelper.php +++ b/classes/helpers/FrmFormTemplatesHelper.php @@ -39,7 +39,8 @@ public static function prepare_template_details( &$template, $pricing, $license_ if ( $template['is_custom'] ) { $template['use_template'] = $template['url']; } elseif ( ! $template['plan_required'] ) { - $link = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type' ) ); + $plan_required = $template['plan_required']; + $link = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type', 'plan_required' ) ); $template['use_template'] = esc_url( $link['url'] ); } From d0a8cc2d8213ecff6f11047015af2cbf6cc16fbe Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 11 Mar 2025 11:23:06 -0300 Subject: [PATCH 4/5] phpcs fix --- classes/helpers/FrmFormTemplatesHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/helpers/FrmFormTemplatesHelper.php b/classes/helpers/FrmFormTemplatesHelper.php index 75cbd3265f..d6cca053f0 100644 --- a/classes/helpers/FrmFormTemplatesHelper.php +++ b/classes/helpers/FrmFormTemplatesHelper.php @@ -40,7 +40,7 @@ public static function prepare_template_details( &$template, $pricing, $license_ $template['use_template'] = $template['url']; } elseif ( ! $template['plan_required'] ) { $plan_required = $template['plan_required']; - $link = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type', 'plan_required' ) ); + $link = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type', 'plan_required' ) ); $template['use_template'] = esc_url( $link['url'] ); } From 1b94e6bae1af388ea9c9decd49973a346eb108b8 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Tue, 11 Mar 2025 11:31:40 -0300 Subject: [PATCH 5/5] Remove broken code --- classes/helpers/FrmFormTemplatesHelper.php | 3 +-- classes/helpers/FrmFormsHelper.php | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/classes/helpers/FrmFormTemplatesHelper.php b/classes/helpers/FrmFormTemplatesHelper.php index d6cca053f0..a3714e277d 100644 --- a/classes/helpers/FrmFormTemplatesHelper.php +++ b/classes/helpers/FrmFormTemplatesHelper.php @@ -39,8 +39,7 @@ public static function prepare_template_details( &$template, $pricing, $license_ if ( $template['is_custom'] ) { $template['use_template'] = $template['url']; } elseif ( ! $template['plan_required'] ) { - $plan_required = $template['plan_required']; - $link = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type', 'plan_required' ) ); + $link = FrmFormsHelper::get_template_install_link( $template, compact( 'pricing', 'license_type' ) ); $template['use_template'] = esc_url( $link['url'] ); } diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php index 018a879a12..0eb206e51a 100644 --- a/classes/helpers/FrmFormsHelper.php +++ b/classes/helpers/FrmFormsHelper.php @@ -1457,11 +1457,6 @@ public static function get_template_install_link( $template, $args ) { 'href' => 'rel', 'atts' => '', ); - } elseif ( self::plan_is_allowed( $args ) ) { - $link = array( - 'url' => FrmAppHelper::admin_upgrade_link( 'addons', 'account/downloads/' ) . '&utm_content=' . $template['slug'], - 'label' => __( 'Renew', 'formidable' ), - ); } else { $link = array( 'url' => $args['pricing'],