Simplify font style rule generation for system and external

westonruter · westonruter · commit d29bfe0b6898 · 2019-09-25T13:39:52.000-07:00
diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
@@ -1402,29 +1402,23 @@ public static function render_block_with_google_fonts( $block_content, $block )
 		}
 
 		$font = self::get_font( $block['attrs'][ $font_family_attribute ] );
-
 		if ( ! $font ) {
 			return $block_content;
 		}
 
-		// Output system fonts.
-		if ( ! isset( $font['handle'], $font['src'] ) ) {
-			$style = sprintf( '<style data-font-family="%s">%s</style>', esc_attr( $font['name'] ), self::get_inline_font_style_rule( $font ) );
-			return $style . $block_content;
-		}
-
-		if ( wp_style_is( $font['handle'] ) ) {
-			return $block_content;
-		}
-
-		wp_enqueue_style( $font['handle'], $font['src'], [], null, 'all' ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
-
-		wp_add_inline_style(
-			$font['handle'],
+		// Create style rule for the custom font. The style sanitizer will de-duplicate.
+		$style = sprintf(
+			'<style data-font-family="%s">%s</style>',
+			esc_attr( $font['name'] ),
 			self::get_inline_font_style_rule( $font )
 		);
 
-		return $block_content;
+		// Make sure that the Google Font is enqueued.
+		if ( isset( $font['src'], $font['handle'] ) && ! wp_style_is( $font['handle'] ) ) {
+			wp_enqueue_style( $font['handle'], $font['src'], [], null, 'all' ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+		}
+
+		return $style . $block_content;
 	}
 
 	/**
