diff --git a/inc/Engine/Media/Fonts/FontsTrait.php b/inc/Engine/Media/Fonts/FontsTrait.php
index 52febbeaf0..e669114488 100644
--- a/inc/Engine/Media/Fonts/FontsTrait.php
+++ b/inc/Engine/Media/Fonts/FontsTrait.php
@@ -22,14 +22,14 @@ protected function get_exclusions(): array {
}
/**
- * Checks if a URL is excluded based on the provided exclusions.
+ * Checks if a font is excluded based on the provided exclusions.
*
- * @param string $url The URL to check.
+ * @param string $subject The string to check.
* @param string[] $exclusions The list of exclusions.
*
* @return bool True if the URL is excluded, false otherwise.
*/
- protected function is_excluded( string $url, array $exclusions ): bool {
+ protected function is_excluded( string $subject, array $exclusions ): bool {
// Bail out early if there are no exclusions.
if ( empty( $exclusions ) ) {
return false;
@@ -53,6 +53,6 @@ function ( $exclusion ) {
$exclusions_str = implode( '|', $escaped_exclusions );
// Check the URL against the combined regex pattern.
- return (bool) preg_match( '#(' . $exclusions_str . ')#i', $url );
+ return (bool) preg_match( '#(' . $exclusions_str . ')#i', $subject );
}
}
diff --git a/inc/Engine/Media/Fonts/Frontend/Controller.php b/inc/Engine/Media/Fonts/Frontend/Controller.php
index ef22405e8f..9f3fa5c807 100644
--- a/inc/Engine/Media/Fonts/Frontend/Controller.php
+++ b/inc/Engine/Media/Fonts/Frontend/Controller.php
@@ -99,14 +99,14 @@ private function rewrite_fonts( $html ): string {
$total_fonts = $total_v1 + $total_v2;
foreach ( $v1_fonts as $font ) {
- if ( $this->is_excluded( $font['url'], $exclusions ) ) {
+ if ( $this->is_excluded( $font[0], $exclusions ) ) {
continue;
}
$html = $this->replace_font( $font, $html );
}
foreach ( $v2_fonts as $font ) {
- if ( $this->is_excluded( $font['url'], $exclusions ) ) {
+ if ( $this->is_excluded( $font[0], $exclusions ) ) {
continue;
}
$html = $this->replace_font( $font, $html );
diff --git a/inc/Engine/Optimization/GoogleFonts/Combine.php b/inc/Engine/Optimization/GoogleFonts/Combine.php
index d7eeef10c4..9308f811ef 100644
--- a/inc/Engine/Optimization/GoogleFonts/Combine.php
+++ b/inc/Engine/Optimization/GoogleFonts/Combine.php
@@ -62,7 +62,7 @@ public function optimize( $html ): string {
$filtered_fonts = array_filter(
$fonts,
function ( $font ) use ( $exclusions ) {
- return ! $this->is_excluded( $font['url'], $exclusions );
+ return ! $this->is_excluded( $font[0], $exclusions );
}
);
diff --git a/inc/Engine/Optimization/GoogleFonts/CombineV2.php b/inc/Engine/Optimization/GoogleFonts/CombineV2.php
index 7726ad9768..b3878f064a 100644
--- a/inc/Engine/Optimization/GoogleFonts/CombineV2.php
+++ b/inc/Engine/Optimization/GoogleFonts/CombineV2.php
@@ -45,7 +45,7 @@ public function optimize( $html ): string {
$filtered_tags = array_filter(
$font_tags,
function ( $tag ) use ( $exclusions ) {
- return ! $this->is_excluded( $tag['url'], $exclusions );
+ return ! $this->is_excluded( $tag[0], $exclusions );
}
);
diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/expected_v1_v2_regex.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/expected_v1_v2_regex.php
index 61749557f7..0d2c2d2350 100644
--- a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/expected_v1_v2_regex.php
+++ b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/expected_v1_v2_regex.php
@@ -12,6 +12,7 @@
+