Skip to content

Revert "Only localize scripts once" #2268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crabcyborg merged 5 commits into from
Mar 11, 2025
Merged

Revert "Only localize scripts once" #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1a9c53
Revert "Only localize scripts once"
Crabcyborg Mar 11, 2025
934c5df
Update workflow
Crabcyborg Mar 11, 2025
98548f3
Try to fix unit test
Crabcyborg Mar 11, 2025
d0a8cc2
phpcs fix
Crabcyborg Mar 11, 2025
1b94e6b
Remove broken code
Crabcyborg Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 0 additions & 11 deletions classes/helpers/FrmAppHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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;
}

/**
Expand Down
5 changes: 0 additions & 5 deletions classes/helpers/FrmFormsHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down