diff --git a/lib/experimental/fonts-api/class-wp-fonts-resolver.php b/lib/experimental/fonts-api/class-wp-fonts-resolver.php index 2318005f1211aa..fae5aba845b8f9 100644 --- a/lib/experimental/fonts-api/class-wp-fonts-resolver.php +++ b/lib/experimental/fonts-api/class-wp-fonts-resolver.php @@ -200,12 +200,12 @@ private static function get_settings() { if ( $set_theme_structure ) { $set_theme_structure = false; $settings = static::set_tyopgraphy_settings_array_structure( $settings ); - } - // Initialize the font families from settings if set and is an array, otherwise default to an empty array. - $settings_font_families = ( isset( $settings['typography']['fontFamilies']['theme'] ) && is_array( $settings['typography']['fontFamilies']['theme'] ) ) - ? $settings['typography']['fontFamilies']['theme'] - : array(); + // Initialize the font families from settings if set and is an array, otherwise default to an empty array. + $settings['typography']['fontFamilies']['theme'] = ( isset( $settings['typography']['fontFamilies']['theme'] ) && is_array( $settings['typography']['fontFamilies']['theme'] ) ) + ? $settings['typography']['fontFamilies']['theme'] + : array(); + } // Initialize the font families from variation if set and is an array, otherwise default to an empty array. $variation_font_families = ( isset( $variation['settings']['typography']['fontFamilies']['theme'] ) && is_array( $variation['settings']['typography']['fontFamilies']['theme'] ) ) @@ -214,7 +214,7 @@ private static function get_settings() { // Merge the variation settings with the global settings. $settings['typography']['fontFamilies']['theme'] = array_merge( - $settings_font_families, + $settings['typography']['fontFamilies']['theme'], $variation_font_families );