Changeset 31861

Timestamp:

03/23/2015 02:10:35 AM (10 years ago)

Author:

pento

Message:

Emoji: Set the emoji image protocol with set_url_scheme(), instead of defaulting to HTTPS.

Props extendwings.

Fixes #31735.

File:

• trunk/src/wp-includes/formatting.php (modified) (3 diffs)

trunk/src/wp-includes/formatting.php

@@ -4165 +4165 @@
 
     /** This filter is documented in wp-includes/script-loader.php */
-    $cdn_url = apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' );
+    $cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ) );
 
     /** This filter is documented in wp-includes/script-loader.php */
@@ -4201 +4201 @@
 
                         list( $char1, $char2 ) = str_split( $chars, 5 );
-                        $entity = '<img src="https:' . $cdn_url . $char1 . '-' . $char2 . $ext . '" class="wp-smiley" style="height: 1em;" />';
+                        $entity = '<img src="' . $cdn_url . $char1 . '-' . $char2 . $ext . '" class="wp-smiley" style="height: 1em;" />';
 
                         $content = str_replace( $flag, $entity, $content );
@@ -4216 +4216 @@
                     foreach ( $matches[1] as $emoji ) {
                         $char = str_replace( array( '&#x', ';'), '', $emoji );
-                        $entity = '<img src="https:' . $cdn_url . $char . $ext . '" class="wp-smiley" style="height: 1em;" />';
+                        $entity = '<img src="' . $cdn_url . $char . $ext . '" class="wp-smiley" style="height: 1em;" />';
 
                         $content = str_replace( $emoji, $entity, $content );