Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-27 15:24:59 +02:00
Code Issues Projects Releases Wiki Activity

Emoji: Update emoji base URL in _print_emoji_detection_script() and wp_staticize_emoji().

Browse Source 
Merges [42590] to the 4.9 branch.
Props pento.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42591


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-01-24 16:54:38 +00:00
parent 3cc1a69391
commit 4d2fabc973
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/formatting.php
View File

@ -5033,7 +5033,7 @@ function _print_emoji_detection_script() {
* *
* @param string The emoji base URL for png images. * @param string The emoji base URL for png images.
*/ */
'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/' ), 'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.4/72x72/' ),
/** /**
* Filters the extension of the emoji png files. * Filters the extension of the emoji png files.
@ -5051,7 +5051,7 @@ function _print_emoji_detection_script() {
* *
* @param string The emoji base URL for svg images. * @param string The emoji base URL for svg images.
*/ */
'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.3/svg/' ), 'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.4/svg/' ),
/** /**
* Filters the extension of the emoji SVG files. * Filters the extension of the emoji SVG files.
@ -5173,7 +5173,7 @@ function wp_staticize_emoji( $text ) {
} }
/** This filter is documented in wp-includes/formatting.php */ /** This filter is documented in wp-includes/formatting.php */
$cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/' ); $cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.4/72x72/' );
/** This filter is documented in wp-includes/formatting.php */ /** This filter is documented in wp-includes/formatting.php */
$ext = apply_filters( 'emoji_ext', '.png' ); $ext = apply_filters( 'emoji_ext', '.png' );

2
wp-includes/general-template.php
View File

@ -2885,7 +2885,7 @@ function wp_resource_hints() {
* The path is removed in the foreach loop below. * The path is removed in the foreach loop below.
*/ */
/** This filter is documented in wp-includes/formatting.php */ /** This filter is documented in wp-includes/formatting.php */
$hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.3/svg/' ); $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.4/svg/' );
foreach ( $hints as $relation_type => $urls ) { foreach ( $hints as $relation_type => $urls ) {
$unique_urls = array(); $unique_urls = array();

2
wp-includes/version.php
View File

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