Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-21 23:11:53 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixes #35376
Props ocean90

Built from https://develop.svn.wordpress.org/trunk@36249


git-svn-id: http://core.svn.wordpress.org/trunk@36216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-01-10 01:24:26 +00:00
parent f63dc802cb
commit 877d14883e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/formatting.php
View File

@ -4532,7 +4532,7 @@ function print_emoji_detection_script() {
*
* @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/' ),
/**
* Filter the extension of the emoji files.
@ -4644,7 +4644,7 @@ function wp_staticize_emoji( $text ) {
$text = wp_encode_emoji( $text );
/** 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 */
$ext = apply_filters( 'emoji_ext', '.png' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36248';
$wp_version = '4.5-alpha-36249';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.