Changeset 32843

Timestamp:

06/18/2015 03:50:42 PM (10 years ago)

Author:

obenland

Message:

Use https for Google API external libraries.

Google recommends it and users are more likely to have the https version cached in their browser already.

Props rommelxcastro.
Fixes #32552.

Location:

trunk/src

Files:

• wp-admin/css/press-this-editor.css (modified) (1 diff)
• wp-content/themes/twentyfifteen/functions.php (modified) (1 diff)
• wp-content/themes/twentyfourteen/functions.php (modified) (1 diff)
• wp-content/themes/twentythirteen/functions.php (modified) (1 diff)
• wp-content/themes/twentytwelve/functions.php (modified) (1 diff)
• wp-includes/js/tinymce/plugins/compat3x/css/dialog.css (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-admin/css/press-this-editor.css

@@ -7 +7 @@
 * Links
 */
-@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,600,700");
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,600,700");
 a {
     color: #0073aa;

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

@@ -199 +199 @@
             'family' => urlencode( implode( '|', $fonts ) ),
             'subset' => urlencode( $subsets ),
-        ), '//fonts.googleapis.com/css' );
+        ), 'https://fonts.googleapis.com/css' );
     }
 

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

@@ -216 +216 @@
             'subset' => urlencode( 'latin,latin-ext' ),
         );
-        $font_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' );
+        $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
     }
 

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

@@ -147 +147 @@
             'subset' => urlencode( 'latin,latin-ext' ),
         );
-        $fonts_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' );
+        $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
     }
 

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

@@ -114 +114 @@
             $subsets .= ',vietnamese';
 
-        $protocol = is_ssl() ? 'https' : 'http';
         $query_args = array(
             'family' => 'Open+Sans:400italic,700italic,400,700',
             'subset' => $subsets,
         );
-        $font_url = add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" );
+        $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
     }
 

trunk/src/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css

@@ -1 @@
-@import url(//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=latin-ext,latin);
+@import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=latin-ext,latin");
 
 /* Generic */

trunk/src/wp-includes/script-loader.php

@@ -150 +150 @@
 
     // WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
-    $scripts->add( 'prototype', '//ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
-    $scripts->add( 'scriptaculous-root', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
-    $scripts->add( 'scriptaculous-builder', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
-    $scripts->add( 'scriptaculous-dragdrop', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
-    $scripts->add( 'scriptaculous-effects', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
-    $scripts->add( 'scriptaculous-slider', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
-    $scripts->add( 'scriptaculous-sound', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
-    $scripts->add( 'scriptaculous-controls', '//ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
+    $scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
+    $scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
+    $scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
+    $scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
+    $scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
+    $scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
+    $scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
+    $scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
     $scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
 
@@ -651 +651 @@
 
         // Hotlink Open Sans, for now
-        $open_sans_font_url = "//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets";
+        $open_sans_font_url = "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets";
     }