← All changes
|
modules/google-fonts/current/load-google-fonts.php
+134
-49
12.9.5
→
16.3-beta
View file →
| @@ -4,14 +4,43 @@ | ||
| 4 | 4 | * |
| 5 | 5 | * @package automattic/jetpack |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 9 | + exit( 0 ); | |
| 10 | +} | |
| 11 | + | |
| 12 | +if ( ! class_exists( 'Jetpack_Google_Font_Face' ) ) { | |
| 13 | + /** | |
| 14 | + * Load Jetpack Google Font Face | |
| 15 | + */ | |
| 16 | + require_once __DIR__ . '/class-jetpack-google-font-face.php'; | |
| 17 | +} | |
| 18 | + | |
| 8 | 19 | /** |
| 9 | 20 | * Gets the Google Fonts data |
| 10 | 21 | * |
| 11 | - * @return object[] The collection data of the Google Fonts. | |
| 22 | + * @return array|null The collection data of the Google Fonts. | |
| 12 | 23 | */ |
| 13 | 24 | function jetpack_get_google_fonts_data() { |
| 25 | + /** | |
| 26 | + * Filters the Google Fonts data before the default retrieval process. | |
| 27 | + * | |
| 28 | + * This filter allows short-circuiting the default Google Fonts data retrieval process. | |
| 29 | + * Returning a non-null value from this filter will bypass the default retrieval | |
| 30 | + * and return the filtered value instead. | |
| 31 | + * | |
| 32 | + * @module google-fonts | |
| 33 | + * | |
| 34 | + * @since 13.7 | |
| 35 | + * | |
| 36 | + * @param null|array $pre The pre-filtered Google Fonts data, default null. | |
| 37 | + */ | |
| 38 | + $pre = apply_filters( 'pre_jetpack_get_google_fonts_data', null ); | |
| 39 | + if ( null !== $pre ) { | |
| 40 | + return $pre; | |
| 41 | + } | |
| 42 | + | |
| 14 | 43 | $default_google_fonts_api_url = 'https://fonts.gstatic.com'; |
| 15 | 44 | $jetpack_google_fonts_collection_url = 'https://s0.wp.com/i/font-collections/jetpack-google-fonts.json'; |
| 16 | 45 | $cache_key = 'jetpack_google_fonts_' . md5( $jetpack_google_fonts_collection_url ); |
| 17 | 46 | $data = get_transient( $cache_key ); |
| @@ -30,9 +59,17 @@ | ||
| 30 | 59 | } |
| 31 | 60 | |
| 32 | 61 | // Replace the google fonts api url if the custom one is provided. |
| 33 | 62 | $custom_google_fonts_api_url = \esc_url( |
| 34 | - /** This filter is documented in projects/packages/google-fonts-provider/src/class-google-fonts-provider.php */ | |
| 63 | + /** | |
| 64 | + * Filters the Google Fonts API URL. | |
| 65 | + * | |
| 66 | + * @module google-fonts | |
| 67 | + * | |
| 68 | + * @since 12.8 | |
| 69 | + * | |
| 70 | + * @param string $url The Google Fonts API URL. | |
| 71 | + */ | |
| 35 | 72 | apply_filters( 'jetpack_google_fonts_api_url', $default_google_fonts_api_url ) |
| 36 | 73 | ); |
| 37 | 74 | if ( $custom_google_fonts_api_url !== $default_google_fonts_api_url ) { |
| 38 | 75 | foreach ( $data['fontFamilies'] as &$font_family ) { |
| @@ -53,10 +90,10 @@ | ||
| 53 | 90 | |
| 54 | 91 | /** |
| 55 | 92 | * Gets the map of the available Google Fonts |
| 56 | 93 | * |
| 57 | - * @param object[] $google_fonts_data The collection data of the Google Fonts. | |
| 58 | - * @return object[] The map of the the available Google Fonts. | |
| 94 | + * @param array $google_fonts_data The collection data of the Google Fonts. | |
| 95 | + * @return array The map of the the available Google Fonts. | |
| 59 | 96 | */ |
| 60 | 97 | function jetpack_get_available_google_fonts_map( $google_fonts_data ) { |
| 61 | 98 | $jetpack_google_fonts_list = array_map( |
| 62 | 99 | function ( $font_family ) { |
| @@ -64,9 +101,17 @@ | ||
| 64 | 101 | }, |
| 65 | 102 | $google_fonts_data['fontFamilies'] |
| 66 | 103 | ); |
| 67 | 104 | |
| 68 | - /** This filter is documented in modules/google-fonts/wordpress-6.3/load-google-fonts.php */ | |
| 105 | + /** | |
| 106 | + * Curated list of Google Fonts. | |
| 107 | + * | |
| 108 | + * @module google-fonts | |
| 109 | + * | |
| 110 | + * @since 10.8 | |
| 111 | + * | |
| 112 | + * @param array $fonts_to_register Array of Google Font names to register. | |
| 113 | + */ | |
| 69 | 114 | $google_font_list = apply_filters( 'jetpack_google_fonts_list', $jetpack_google_fonts_list ); |
| 70 | 115 | $available_google_fonts_map = array(); |
| 71 | 116 | |
| 72 | 117 | foreach ( $google_font_list as $google_font ) { |
| @@ -76,31 +121,50 @@ | ||
| 76 | 121 | return $available_google_fonts_map; |
| 77 | 122 | } |
| 78 | 123 | |
| 79 | 124 | /** |
| 80 | - * Gets the font families of the active theme | |
| 125 | + * Whether the request URL is a REST route. | |
| 81 | 126 | * |
| 82 | - * @return object[] The font families of the active theme. | |
| 127 | + * Theme JSON can resolve before REST_REQUEST is defined, and the Accept header also matches front-end requests. | |
| 128 | + * | |
| 129 | + * @since 16.3 | |
| 130 | + * | |
| 131 | + * @return bool | |
| 83 | 132 | */ |
| 84 | -function jetpack_get_theme_fonts_map() { | |
| 85 | - if ( ! class_exists( 'WP_Theme_JSON_Resolver' ) ) { | |
| 86 | - return array(); | |
| 133 | +function jetpack_google_fonts_is_rest_url() { | |
| 134 | + // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Only used to classify the request. | |
| 135 | + if ( isset( $_GET['rest_route'] ) ) { | |
| 136 | + return true; | |
| 87 | 137 | } |
| 138 | + $path = (string) wp_parse_url( isset( $_SERVER['REQUEST_URI'] ) ? wp_unslash( $_SERVER['REQUEST_URI'] ) : '', PHP_URL_PATH ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Parsed for path comparison only. | |
| 139 | + return str_contains( $path, '/' . rest_get_url_prefix() . '/' ); | |
| 140 | +} | |
| 88 | 141 | |
| 89 | - $theme_json = WP_Theme_JSON_Resolver::get_theme_data(); | |
| 90 | - $raw_data = $theme_json->get_data(); | |
| 91 | - if ( empty( $raw_data['settings']['typography']['fontFamilies'] ) ) { | |
| 92 | - return array(); | |
| 93 | - } | |
| 142 | +/** | |
| 143 | + * Whether catalogue faces are needed in theme JSON for an editor or API request. | |
| 144 | + * | |
| 145 | + * @since 16.3 | |
| 146 | + * | |
| 147 | + * @return bool | |
| 148 | + */ | |
| 149 | +function jetpack_google_fonts_load_font_faces() { | |
| 150 | + $load_font_faces = is_admin() | |
| 151 | + || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) | |
| 152 | + || jetpack_google_fonts_is_rest_url() | |
| 153 | + || ( defined( 'WP_CLI' ) && WP_CLI ); | |
| 94 | 154 | |
| 95 | - $theme_fonts_map = array(); | |
| 96 | - foreach ( $raw_data['settings']['typography']['fontFamilies'] as $font_family ) { | |
| 97 | - if ( isset( $font_family['name'] ) ) { | |
| 98 | - $theme_fonts_map[ $font_family['name'] ] = true; | |
| 99 | - } | |
| 100 | - } | |
| 101 | - | |
| 102 | - return $theme_fonts_map; | |
| 155 | + /** | |
| 156 | + * Filters whether catalogue font faces are loaded into theme JSON. | |
| 157 | + * | |
| 158 | + * When true, the catalogue's files reach theme JSON and the native font printer prints all of them. | |
| 159 | + * | |
| 160 | + * @module google-fonts | |
| 161 | + * | |
| 162 | + * @since 16.3 | |
| 163 | + * | |
| 164 | + * @param bool $load_font_faces Whether to load catalogue font faces. Default true for editor, API and CLI requests. | |
| 165 | + */ | |
| 166 | + return (bool) apply_filters( 'jetpack_google_fonts_load_font_faces', $load_font_faces ); | |
| 103 | 167 | } |
| 104 | 168 | |
| 105 | 169 | /** |
| 106 | 170 | * Register google fonts to the theme json data |
| @@ -114,23 +178,14 @@ | ||
| 114 | 178 | return $theme_json; |
| 115 | 179 | } |
| 116 | 180 | |
| 117 | 181 | $available_google_fonts_map = jetpack_get_available_google_fonts_map( $google_fonts_data ); |
| 118 | - $theme_fonts_map = jetpack_get_theme_fonts_map(); | |
| 119 | 182 | $google_fonts_families = array_values( |
| 120 | 183 | array_filter( |
| 121 | 184 | $google_fonts_data['fontFamilies'], |
| 122 | - function ( $google_fonts_family ) use ( $available_google_fonts_map, $theme_fonts_map ) { | |
| 185 | + function ( $google_fonts_family ) use ( $available_google_fonts_map ) { | |
| 123 | 186 | $name = $google_fonts_family['name']; |
| 124 | - | |
| 125 | - // Filter out the fonts that are provided by the active theme. | |
| 126 | - if ( isset( $theme_fonts_map[ $name ] ) && $theme_fonts_map[ $name ] ) { | |
| 127 | - return false; | |
| 128 | - } | |
| 129 | - | |
| 130 | - return isset( $available_google_fonts_map[ $name ] ) | |
| 131 | - ? $available_google_fonts_map[ $name ] | |
| 132 | - : false; | |
| 187 | + return $available_google_fonts_map[ $name ] ?? false; | |
| 133 | 188 | } |
| 134 | 189 | ) |
| 135 | 190 | ); |
| 136 | 191 | |
| @@ -139,9 +194,13 @@ | ||
| 139 | 194 | if ( empty( $raw_data['settings']['typography']['fontFamilies'][ $origin ] ) ) { |
| 140 | 195 | $raw_data['settings']['typography']['fontFamilies'][ $origin ] = array(); |
| 141 | 196 | } |
| 142 | 197 | |
| 198 | + $load_font_faces = jetpack_google_fonts_load_font_faces(); | |
| 143 | 199 | foreach ( $google_fonts_families as $font_family ) { |
| 200 | + if ( ! $load_font_faces ) { | |
| 201 | + unset( $font_family['fontFace'] ); | |
| 202 | + } | |
| 144 | 203 | $raw_data['settings']['typography']['fontFamilies'][ $origin ][] = $font_family; |
| 145 | 204 | } |
| 146 | 205 | |
| 147 | 206 | $theme_json_class = get_class( $theme_json ); |
| @@ -152,10 +211,10 @@ | ||
| 152 | 211 | |
| 153 | 212 | /** |
| 154 | 213 | * Filter out the deprecated font families that are from the jetpack-google-fonts provider. |
| 155 | 214 | * |
| 156 | - * @param object[] $font_families The font families. | |
| 157 | - * @return object[] The filtered font families. | |
| 215 | + * @param array[] $font_families The font families. | |
| 216 | + * @return array[] The filtered font families. | |
| 158 | 217 | */ |
| 159 | 218 | function jetpack_google_fonts_filter_out_deprecated_font_data( $font_families ) { |
| 160 | 219 | return array_values( |
| 161 | 220 | array_filter( |
| @@ -164,9 +223,9 @@ | ||
| 164 | 223 | $has_deprecated_google_fonts_data = false; |
| 165 | 224 | |
| 166 | 225 | if ( isset( $font_family['fontFace'] ) ) { |
| 167 | 226 | foreach ( $font_family['fontFace'] as $font_face ) { |
| 168 | - $provider = isset( $font_face['provider'] ) ? $font_face['provider'] : ''; | |
| 227 | + $provider = $font_face['provider'] ?? ''; | |
| 169 | 228 | if ( $provider === 'jetpack-google-fonts' ) { |
| 170 | 229 | $has_deprecated_google_fonts_data = true; |
| 171 | 230 | break; |
| 172 | 231 | } |
| @@ -179,14 +238,15 @@ | ||
| 179 | 238 | ); |
| 180 | 239 | } |
| 181 | 240 | |
| 182 | 241 | /** |
| 183 | - * Unregister the google fonts data from user's theme json data that were stored by accident. | |
| 242 | + * Unregister the deprecated jetpack-google-fonts provider from theme json data that were stored | |
| 243 | + * before we moved to the Font Library. | |
| 184 | 244 | * |
| 185 | - * @param WP_Theme_JSON_Data $theme_json The theme json data of user. | |
| 245 | + * @param WP_Theme_JSON_Data $theme_json The theme json data. | |
| 186 | 246 | * @return WP_Theme_JSON_Data The filtered theme json data. |
| 187 | 247 | */ |
| 188 | -function jetpack_unregister_deprecated_google_fonts_from_theme_json_data_user( $theme_json ) { | |
| 248 | +function jetpack_unregister_deprecated_google_fonts_from_theme_json_data( $theme_json ) { | |
| 189 | 249 | $raw_data = $theme_json->get_data(); |
| 190 | 250 | $origin = 'theme'; |
| 191 | 251 | if ( empty( $raw_data['settings']['typography']['fontFamilies'][ $origin ] ) ) { |
| 192 | 252 | return $theme_json; |
| @@ -200,16 +260,41 @@ | ||
| 200 | 260 | $theme_json_class = get_class( $theme_json ); |
| 201 | 261 | return new $theme_json_class( $raw_data, 'custom' ); |
| 202 | 262 | } |
| 203 | 263 | |
| 204 | -add_filter( 'wp_theme_json_data_user', 'jetpack_unregister_deprecated_google_fonts_from_theme_json_data_user' ); | |
| 264 | +add_filter( 'wp_theme_json_data_theme', 'jetpack_unregister_deprecated_google_fonts_from_theme_json_data' ); | |
| 265 | +add_filter( 'wp_theme_json_data_user', 'jetpack_unregister_deprecated_google_fonts_from_theme_json_data' ); | |
| 205 | 266 | |
| 206 | -if ( ! class_exists( 'Jetpack_Google_Font_Face' ) ) { | |
| 207 | - /** | |
| 208 | - * Load Jetpack Google Font Face | |
| 209 | - */ | |
| 210 | - require_once __DIR__ . '/class-jetpack-google-font-face.php'; | |
| 267 | +/** | |
| 268 | + * Clean up the Google Fonts data if either google fonts module is disabled or Jetpack is disabled. | |
| 269 | + */ | |
| 270 | +function jetpack_unregister_google_fonts() { | |
| 271 | + $post_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id(); | |
| 211 | 272 | |
| 212 | - // Initialize Jetpack Google Font Face to avoid printing **ALL** google fonts provided by this module. | |
| 213 | - // See p1700040028362329-slack-C4GAQ900P and p7DVsv-jib-p2 | |
| 214 | - new Jetpack_Google_Font_Face(); | |
| 273 | + // Get user config | |
| 274 | + $user_config = WP_Theme_JSON_Resolver::get_user_data(); | |
| 275 | + $user_config_raw_data = $user_config->get_raw_data(); | |
| 276 | + $user_config_raw_data['isGlobalStylesUserThemeJSON'] = true; | |
| 277 | + | |
| 278 | + // Prepare data for saving | |
| 279 | + if ( ! empty( $user_config_raw_data['settings']['typography']['fontFamilies']['default'] ) ) { | |
| 280 | + $user_config_raw_data['settings']['typography']['fontFamilies']['default'] = array(); | |
| 281 | + } | |
| 282 | + | |
| 283 | + if ( ! empty( $user_config_raw_data['settings']['typography']['fontFamilies']['theme'] ) ) { | |
| 284 | + $user_config_raw_data['settings']['typography']['fontFamilies']['theme'] = jetpack_google_fonts_filter_out_deprecated_font_data( | |
| 285 | + $user_config_raw_data['settings']['typography']['fontFamilies']['theme'] // @phan-suppress-current-line PhanTypeInvalidDimOffset, PhanTypeMismatchArgument | |
| 286 | + ); | |
| 287 | + } | |
| 288 | + | |
| 289 | + // Prepare changes | |
| 290 | + $changes = new stdClass(); | |
| 291 | + $changes->ID = $post_id; | |
| 292 | + $changes->post_content = wp_json_encode( $user_config_raw_data, JSON_UNESCAPED_SLASHES ); | |
| 293 | + | |
| 294 | + // Update user config | |
| 295 | + wp_update_post( wp_slash( (array) $changes ), true ); | |
| 215 | 296 | } |
| 297 | +add_action( 'jetpack_deactivate_module_google-fonts', 'jetpack_unregister_google_fonts' ); | |
| 298 | + | |
| 299 | +// Print legacy catalogue faces separately from native theme and user fonts. | |
| 300 | +new Jetpack_Google_Font_Face(); | |