From 69de85fd489c6cc478c6029ad7ea111bb3fc1045 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 23 Mar 2015 02:11:28 +0000 Subject: [PATCH] Emoji: Set the emoji image protocol with `set_url_scheme()`, instead of defaulting to HTTPS. Props extendwings. Fixes #31735. Built from https://develop.svn.wordpress.org/trunk@31861 git-svn-id: http://core.svn.wordpress.org/trunk@31840 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/formatting.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 4c229b7796..0377bbdd54 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -4164,7 +4164,7 @@ function wp_staticize_emoji( $text ) { } /** 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 */ $ext = apply_filters( 'emoji_ext', '.png' ); @@ -4200,7 +4200,7 @@ function wp_staticize_emoji( $text ) { $chars = str_replace( array( '&#x', ';'), '', $flag ); list( $char1, $char2 ) = str_split( $chars, 5 ); - $entity = ''; + $entity = ''; $content = str_replace( $flag, $entity, $content ); } @@ -4215,7 +4215,7 @@ function wp_staticize_emoji( $text ) { if ( ! empty( $matches[1] ) ) { foreach ( $matches[1] as $emoji ) { $char = str_replace( array( '&#x', ';'), '', $emoji ); - $entity = ''; + $entity = ''; $content = str_replace( $emoji, $entity, $content ); }