Ticket #32552: 32552.diff

wp-admin/css/press-this-editor-rtl.css

@@ -6 +6 @@
 /**
 * 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;
 }

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

@@ -6 +6 @@
 /**
 * 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;
 }

wp-content/themes/twentyfifteen/functions.php

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

wp-content/themes/twentyfourteen/functions.php

@@ -215 +215 @@
                         'family' => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ),
                         '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' );
         }
 
         return $font_url;

wp-content/themes/twentythirteen/functions.php

@@ -146 +146 @@
                         'family' => urlencode( implode( '|', $font_families ) ),
                         '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' );
         }
 
         return $fonts_url;

wp-content/themes/twentytwelve/functions.php

@@ -113 +113 @@
                 elseif ( 'vietnamese' == $subset )
                         $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" );
         }
 
         return $font_url;

wp-includes/script-loader.php

@@ -149 +149 @@
         $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
 
         // 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') );
 
         // not used in core, replaced by Jcrop.js
@@ -646 +646 @@
                 }
 
                 // 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";
         }
 
         // Register a stylesheet for the selected admin color scheme.