Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-07 08:01:54 +01:00
Code Issues Projects Releases Wiki Activity

Emoji: Upgrade Twemoji to 11.2.0.

Browse Source 
This upgrade includes general improvements to the style of a variety of emoji.

Full changelog: https://github.com/twitter/twemoji/compare/v11.0.0...v11.2.0

Props desrosj, pento.
Fixes #45133.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-01-18 01:42:50 +00:00
parent 6ef9017c96
commit 0ee053758e
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/formatting.php
View File

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

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

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

4
wp-includes/js/twemoji.js
View File

@ -373,7 +373,7 @@ var twemoji = (function (
iconId = grabTheRightIcon(rawText);
i = index + rawText.length;
src = options.callback(iconId, options);
if (src) {
if (iconId && src) {
img = new Image();
img.onerror = options.onerror;
img.setAttribute('draggable', 'false');
@ -434,7 +434,7 @@ var twemoji = (function (
src = options.callback(iconId, options),
attrib,
attrname;
if (src) {
if (iconId && src) {
// recycle the match string replacing the emoji
// with its image counter part
ret = '<img '.concat(

2
wp-includes/js/twemoji.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/wp-emoji-release.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.1-beta1-44643';
$wp_version = '5.1-beta1-44644';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.