Changeset 36428 for branches/4.4

Timestamp:

02/01/2016 02:23:16 PM (9 years ago)

Author:

ocean90

Message:

Emoji: Explicitly use https as the scheme for emoji fallback images, as they're only served over HTTPS by the CDN anyway.

Merges [36249] to the 4.4 branch.
See #35376.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (2 diffs)

branches/4.4/src/wp-includes/formatting.php

@@ -4535 +4535 @@
          * @param string The emoji base URL.
          */
-        'baseUrl' => apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) ),
+        'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/72x72/' ),
 
         /**
@@ -4647 +4647 @@
 
     /** This filter is documented in wp-includes/formatting.php */
-    $cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) );
+    $cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/72x72/' );
 
     /** This filter is documented in wp-includes/formatting.php */