Skip to content

Fix: WP_Font_Face: Font names that contain single quotes are not wrapped in double quotes #8982

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

Open
iamsandeepdahiya wants to merge 6 commits into
base: trunk
Choose a base branch
from
+4 −10
Open

Fix: WP_Font_Face: Font names that contain single quotes are not wrapped in double quotes #8982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
201d1cf
fix:build-font-face-css single inverted comma in name issue
iamsandeepdahiya Jun 15, 2025
08ad65b
removed whitespace from the end
iamsandeepdahiya Jun 15, 2025
f09ea75
using WP_Font_Utils::maybe_add_quotes() after exposing it public
iamsandeepdahiya Jun 16, 2025
9f29537
renamed to normalize_quoted_font_family_name and added more edge cases
iamsandeepdahiya Jun 17, 2025
b88e32c
"Reverting to previous minor fix"
iamsandeepdahiya Jun 17, 2025
044e261
removed whitespace and renamed to normalize_css_font_family_name
iamsandeepdahiya Jun 17, 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
8 changes: 1 addition & 7 deletions src/wp-includes/fonts/class-wp-font-face.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,7 @@ private function build_font_face_css( array $font_face ) {
* Wrap font-family in quotes if it contains spaces
* and is not already wrapped in quotes.
*/
if (
str_contains( $font_face['font-family'], ' ' ) &&
! str_contains( $font_face['font-family'], '"' ) &&
! str_contains( $font_face['font-family'], "'" )
) {
$font_face['font-family'] = '"' . $font_face['font-family'] . '"';
}
$font_face['font-family'] = WP_Font_Utils::normalize_css_font_family_name( $font_face['font-family'] );

foreach ( $font_face as $key => $value ) {
// Compile the "src" parameter.
Expand Down
6 changes: 3 additions & 3 deletions src/wp-includes/fonts/class-wp-font-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class WP_Font_Utils {
* @param string $item A font family name.
* @return string The font family name with surrounding quotes, if necessary.
*/
private static function maybe_add_quotes( $item ) {
public static function normalize_css_font_family_name( $item ) {
// Matches strings that are not exclusively alphabetic characters or hyphens, and do not exactly follow the pattern generic(alphabetic characters or hyphens).
$regex = '/^(?!generic\([a-zA-Z\-]+\)$)(?!^[a-zA-Z\-]+$).+/';
$item = trim( $item );
Expand Down Expand Up @@ -67,14 +67,14 @@ public static function sanitize_font_family( $font_family ) {
if ( str_contains( $output, ',' ) ) {
$items = explode( ',', $output );
foreach ( $items as $item ) {
$formatted_item = self::maybe_add_quotes( $item );
$formatted_item = self::normalize_css_font_family_name( $item );
if ( ! empty( $formatted_item ) ) {
$formatted_items[] = $formatted_item;
}
}
return implode( ', ', $formatted_items );
}
return self::maybe_add_quotes( $output );
return self::normalize_css_font_family_name( $output );
}

/**
Expand Down
Loading