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: 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; } /** 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'],