Skip to content

Import the fonts selected as default on the customizer so we can get the working version of Libre Baskerville #45957

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

Draft
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

Import the fonts selected as default on the customizer so we can get the working version of Libre Baskerville #45957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2622780
This would fix DOTTHEM-52 by importing the fonts selected as default …
Nov 17, 2025
e0c39f5
changelog
Nov 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
4 changes: 4 additions & 0 deletions .../changelog/DOTTHEM-52-macronized-vowels-not-rendering-correctly-when-libre-baskerville-is
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: other

Import the fonts selected as default on the customizer.
25 changes: 25 additions & 0 deletions projects/plugins/jetpack/modules/google-fonts/current/class-jetpack-google-font-face.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
$fonts_to_print = array();

$this->collect_global_styles_fonts();
$this->collect_selected_fonts();
$fonts_in_use = array_values( array_unique( $this->fonts_in_use, SORT_STRING ) );
$fonts_in_use = array_map(
function ( $font_slug ) use ( $font_slug_aliases ) {
Expand All @@ -86,6 +87,30 @@
}
}

/**
* Collect fonts selected in the Jetpack Fonts module.
*/
public function collect_selected_fonts() {
if ( ! class_exists( '\Jetpack_Fonts' ) ) {
return;
}

$jetpack_fonts_instance = \Jetpack_Fonts::get_instance();

$selected_fonts = array_unique(
array_map(
function ( $font ) {
return $this->format_font( $font['cssName'] );
},
(array) $jetpack_fonts_instance->get( 'selected_fonts' )

Check failure on line 105 in projects/plugins/jetpack/modules/google-fonts/current/class-jetpack-google-font-face.php

View workflow job for this annotation

GitHub Actions / Static analysis 

UndefError PhanUndeclaredMethod Call to undeclared method \Jetpack_Fonts::get

Suggestion: Did you mean expr::get_instance()

FAQ on Phan issues: pdWQjU-Jb-p2
)
);

foreach ( $selected_fonts as $font_slug ) {
$this->add_font( $font_slug );
}
}

/**
* Collect fonts used for global styles settings.
*/
Expand Down
Loading