Ticket #37171: 37171.5.diff

src/wp-content/themes/twentyfifteen/functions.php

@@ -273 +273 @@
 add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );
 
 /**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Fifteen 1.6
+ *
+ * @param array   $urls          URLs to print for resource hints.
+ * @param string  $relation_type The relation type the URLs are printed.
+ * @return array URLs to print for resource hints.
+ */
+function twentyfifteen_resource_hints( $urls, $relation_type ) {
+        if ( wp_style_is( 'twentyfifteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+                if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+                        $urls[] = array(
+                                'href' => 'https://fonts.gstatic.com',
+                                'crossorigin',
+                        );
+                } else {
+                        $urls[] = 'https://fonts.gstatic.com';
+                }
+        }
+
+        return $urls;
+}
+add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
+
+/**
  * Add featured image as background image to post navigation elements.
  *
  * @since Twenty Fifteen 1.0

src/wp-content/themes/twentyfourteen/functions.php

@@ -277 +277 @@
 }
 add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen_admin_fonts' );
 
+/**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Fourteen 1.8
+ *
+ * @param array   $urls          URLs to print for resource hints.
+ * @param string  $relation_type The relation type the URLs are printed.
+ * @return array URLs to print for resource hints.
+ */
+function twentyfourteen_resource_hints( $urls, $relation_type ) {
+        if ( wp_style_is( 'twentyfourteen-lato', 'queue' ) && 'preconnect' === $relation_type ) {
+                if ( wp_style_is( 'twentyfifteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+                        if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+                                $urls[] = array(
+                                        'href' => 'https://fonts.gstatic.com',
+                                        'crossorigin',
+                                );
+                        } else {
+                                $urls[] = 'https://fonts.gstatic.com';
+                        }
+                }
+        }
+
+        return $urls;
+}
+add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
+
 if ( ! function_exists( 'twentyfourteen_the_attached_image' ) ) :
 /**
  * Print the attached image with a link to the next attached image.

src/wp-content/themes/twentythirteen/functions.php

@@ -191 +191 @@
 add_action( 'wp_enqueue_scripts', 'twentythirteen_scripts_styles' );
 
 /**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Thirteen 2.0
+ *
+ * @param array   $urls          URLs to print for resource hints.
+ * @param string  $relation_type The relation type the URLs are printed.
+ * @return array URLs to print for resource hints.
+ */
+function twentythirteen_resource_hints( $urls, $relation_type ) {
+        if ( wp_style_is( 'twentythirteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+                if ( wp_style_is( 'twentyfifteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+                        if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+                                $urls[] = array(
+                                        'href' => 'https://fonts.gstatic.com',
+                                        'crossorigin',
+                                );
+                        } else {
+                                $urls[] = 'https://fonts.gstatic.com';
+                        }
+                }
+        }
+
+        return $urls;
+}
+add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
+
+/**
  * Filter the page title.
  *
  * Creates a nicely formatted and more specific title element text for output

src/wp-content/themes/twentytwelve/functions.php

@@ -158 +158 @@
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
 
 /**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Twelve 2.1
+ *
+ * @param array   $urls          URLs to print for resource hints.
+ * @param string  $relation_type The relation type the URLs are printed.
+ * @return array URLs to print for resource hints.
+ */
+function twentytwelve_resource_hints( $urls, $relation_type ) {
+        if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+                if ( wp_style_is( 'twentyfifteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
+                        if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
+                                $urls[] = array(
+                                        'href' => 'https://fonts.gstatic.com',
+                                        'crossorigin',
+                                );
+                        } else {
+                                $urls[] = 'https://fonts.gstatic.com';
+                        }
+                }
+        }
+
+        return $urls;
+}
+add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
+
+/**
  * Filter TinyMCE CSS path to include Google Fonts.
  *
  * Adds additional stylesheets to the TinyMCE editor if needed.