Changeset 21391

Timestamp:

08/01/2012 03:36:44 PM (13 years ago)

Author:

lancewillett

Message:

Twenty Twelve: use is_ssl() to load the correct protocol for Google font CSS file. Fixes #21399, props obenland.

File:

• trunk/wp-content/themes/twentytwelve/functions.php (modified) (1 diff)

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

@@ -112 +112 @@
      */
     $options = $twentytwelve_options->get_theme_options();
-    if ( $options['enable_fonts'] )
-        wp_enqueue_style( 'twentytwelve-fonts', 'http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700' );
-
+    if ( $options['enable_fonts'] ) {
+        $protocol = is_ssl() ? 'https' : 'http';
+        wp_enqueue_style( 'twentytwelve-fonts', "$protocol://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" );
+    }
+    
     /**
      * Load our main CSS file.