← All changes | modules/google-fonts/current/load-google-fonts.php +76 -40 13.3.3 → 16.3-a.7 View file →

		@@ -4,8 +4,12 @@
4	4	*
5	5	* @package automattic/jetpack
6	6	*/
7	7
	8	+if ( ! defined( 'ABSPATH' ) ) {
	9	+ exit( 0 );
	10	+}
	11	+
8	12	if ( ! class_exists( 'Jetpack_Google_Font_Face' ) ) {
9	13	/**
10	14	* Load Jetpack Google Font Face
11	15	*/
		@@ -14,11 +18,29 @@
14	18
15	19	/**
16	20	* Gets the Google Fonts data
17	21	*
18		- * @return object[] The collection data of the Google Fonts.
	22	+ * @return array|null The collection data of the Google Fonts.
19	23	*/
20	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	+
21	43	$default_google_fonts_api_url = 'https://fonts.gstatic.com';
22	44	$jetpack_google_fonts_collection_url = 'https://s0.wp.com/i/font-collections/jetpack-google-fonts.json';
23	45	$cache_key = 'jetpack_google_fonts_' . md5( $jetpack_google_fonts_collection_url );
24	46	$data = get_transient( $cache_key );
		@@ -37,9 +59,17 @@
37	59	}
38	60
39	61	// Replace the google fonts api url if the custom one is provided.
40	62	$custom_google_fonts_api_url = \esc_url(
41		- /** 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	+ */
42	72	apply_filters( 'jetpack_google_fonts_api_url', $default_google_fonts_api_url )
43	73	);
44	74	if ( $custom_google_fonts_api_url !== $default_google_fonts_api_url ) {
45	75	foreach ( $data['fontFamilies'] as &$font_family ) {
		@@ -60,10 +90,10 @@
60	90
61	91	/**
62	92	* Gets the map of the available Google Fonts
63	93	*
64		- * @param object[] $google_fonts_data The collection data of the Google Fonts.
65		- * @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.
66	96	*/
67	97	function jetpack_get_available_google_fonts_map( $google_fonts_data ) {
68	98	$jetpack_google_fonts_list = array_map(
69	99	function ( $font_family ) {
		@@ -71,9 +101,17 @@
71	101	},
72	102	$google_fonts_data['fontFamilies']
73	103	);
74	104
75		- /** 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	+ */
76	114	$google_font_list = apply_filters( 'jetpack_google_fonts_list', $jetpack_google_fonts_list );
77	115	$available_google_fonts_map = array();
78	116
79	117	foreach ( $google_font_list as $google_font ) {
		@@ -83,35 +121,8 @@
83	121	return $available_google_fonts_map;
84	122	}
85	123
86	124	/**
87		- * Gets the font families of the active theme
88		- *
89		- * @return object[] The font families of the active theme.
90		- */
91		-function jetpack_get_theme_fonts_map() {
92		- if ( ! class_exists( 'WP_Theme_JSON_Resolver' ) ) {
93		- return array();
94		- }
95		-
96		- $theme_json = WP_Theme_JSON_Resolver::get_theme_data();
97		- $raw_data = $theme_json->get_data();
98		- if ( empty( $raw_data['settings']['typography']['fontFamilies'] ) ) {
99		- return array();
100		- }
101		-
102		- $theme_fonts_map = array();
103		- foreach ( $raw_data['settings']['typography']['fontFamilies'] as $font_family ) {
104		- $font_family_name = $font_family['name'] ?? Jetpack_Google_Font_Face::get_font_family_name( $font_family );
105		- if ( $font_family_name ) {
106		- $theme_fonts_map[ $font_family_name ] = true;
107		- }
108		- }
109		-
110		- return $theme_fonts_map;
111		-}
112		-
113		-/**
114	125	* Register google fonts to the theme json data
115	126	*
116	127	* @param WP_Theme_JSON_Data $theme_json The theme json data of core.
117	128	* @return WP_Theme_JSON_Data The theme json data with registered google fonts.
		@@ -122,20 +133,13 @@
122	133	return $theme_json;
123	134	}
124	135
125	136	$available_google_fonts_map = jetpack_get_available_google_fonts_map( $google_fonts_data );
126		- $theme_fonts_map = jetpack_get_theme_fonts_map();
127	137	$google_fonts_families = array_values(
128	138	array_filter(
129	139	$google_fonts_data['fontFamilies'],
130		- function ( $google_fonts_family ) use ( $available_google_fonts_map, $theme_fonts_map ) {
	140	+ function ( $google_fonts_family ) use ( $available_google_fonts_map ) {
131	141	$name = $google_fonts_family['name'];
132		-
133		- // Filter out the fonts that are provided by the active theme.
134		- if ( isset( $theme_fonts_map[ $name ] ) && $theme_fonts_map[ $name ] ) {
135		- return false;
136		- }
137		-
138	142	return $available_google_fonts_map[ $name ] ?? false;
139	143	}
140	144	)
141	145	);
		@@ -209,8 +213,40 @@
209	213	}
210	214
211	215	add_filter( 'wp_theme_json_data_theme', 'jetpack_unregister_deprecated_google_fonts_from_theme_json_data' );
212	216	add_filter( 'wp_theme_json_data_user', 'jetpack_unregister_deprecated_google_fonts_from_theme_json_data' );
	217	+
	218	+/**
	219	+ * Clean up the Google Fonts data if either google fonts module is disabled or Jetpack is disabled.
	220	+ */
	221	+function jetpack_unregister_google_fonts() {
	222	+ $post_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
	223	+
	224	+ // Get user config
	225	+ $user_config = WP_Theme_JSON_Resolver::get_user_data();
	226	+ $user_config_raw_data = $user_config->get_raw_data();
	227	+ $user_config_raw_data['isGlobalStylesUserThemeJSON'] = true;
	228	+
	229	+ // Prepare data for saving
	230	+ if ( ! empty( $user_config_raw_data['settings']['typography']['fontFamilies']['default'] ) ) {
	231	+ $user_config_raw_data['settings']['typography']['fontFamilies']['default'] = array();
	232	+ }
	233	+
	234	+ if ( ! empty( $user_config_raw_data['settings']['typography']['fontFamilies']['theme'] ) ) {
	235	+ $user_config_raw_data['settings']['typography']['fontFamilies']['theme'] = jetpack_google_fonts_filter_out_deprecated_font_data(
	236	+ $user_config_raw_data['settings']['typography']['fontFamilies']['theme'] // @phan-suppress-current-line PhanTypeInvalidDimOffset, PhanTypeMismatchArgument
	237	+ );
	238	+ }
	239	+
	240	+ // Prepare changes
	241	+ $changes = new stdClass();
	242	+ $changes->ID = $post_id;
	243	+ $changes->post_content = wp_json_encode( $user_config_raw_data, JSON_UNESCAPED_SLASHES );
	244	+
	245	+ // Update user config
	246	+ wp_update_post( wp_slash( (array) $changes ), true );
	247	+}
	248	+add_action( 'jetpack_deactivate_module_google-fonts', 'jetpack_unregister_google_fonts' );
213	249
214	250	// Initialize Jetpack Google Font Face to avoid printing **ALL** google fonts provided by this module.
215	251	// See p1700040028362329-slack-C4GAQ900P and p7DVsv-jib-p2
216	252	new Jetpack_Google_Font_Face();