Changeset 38870

Timestamp:

10/23/2016 01:55:49 AM (8 years ago)

Author:

peterwilsoncc

Message:

Bundled theme: Add preconnect to fonts.gstatic.com in 2012-15 themes.

Add preconnect hinting for https://fonts.gstatic.com in the bundled themes using Google fonts. WordPress versions 4.7+ include a crossorigin attribute, earlier versions will not.

Props leobaiano, swissspidy, peterwilsoncc.
Fixes #37171.

Location:

trunk/src/wp-content/themes

Files:

• twentyfifteen/functions.php (modified) (1 diff)
• twentyfourteen/functions.php (modified) (1 diff)
• twentythirteen/functions.php (modified) (1 diff)
• twentytwelve/functions.php (modified) (1 diff)

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

@@ -287 +287 @@
 
 /**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Fifteen 1.7
+ *
+ * @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.
  *

trunk/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.9
+ *
+ * @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 ( 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' ) ) :

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

@@ -190 +190 @@
 }
 add_action( 'wp_enqueue_scripts', 'twentythirteen_scripts_styles' );
+
+/**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Thirteen 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 twentythirteen_resource_hints( $urls, $relation_type ) {
+    if ( wp_style_is( 'twentythirteen-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 );
 
 /**

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

@@ -157 +157 @@
 }
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
+
+/**
+ * Add preconnect for Google Fonts.
+ *
+ * @since Twenty Twelve 2.2
+ *
+ * @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 ( 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 );
 
 /**