Skip to content

Commit

Permalink
Emoji: Upgrade Twemoji to 11.2.0.
Browse files Browse the repository at this point in the history
This upgrade includes general improvements to the style of a variety of emoji.

Full changelog: twitter/twemoji@v11.0.0...v11.2.0

Props desrosj, pento.
Fixes #45133.



git-svn-id: https://develop.svn.wordpress.org/trunk@44644 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
pento committed Jan 18, 2019
1 parent 73cbf3e commit d3ee420
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -107,7 +107,7 @@
"polyfill-library": "^3.26.0-0",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"twemoji": "11.0.0",
"twemoji": "11.2.0",
"underscore": "1.8.3",
"whatwg-fetch": "^3.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions src/wp-includes/formatting.php
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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' );
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/general-template.php
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/tests/formatting/Emoji.php
Expand Up @@ -6,8 +6,8 @@
*/
class Tests_Formatting_Emoji extends WP_UnitTestCase {

private $png_cdn = 'https://s.w.org/images/core/emoji/11/72x72/';
private $svn_cdn = 'https://s.w.org/images/core/emoji/11/svg/';
private $png_cdn = 'https://s.w.org/images/core/emoji/11.2.0/72x72/';
private $svn_cdn = 'https://s.w.org/images/core/emoji/11.2.0/svg/';

/**
* @ticket 36525
Expand Down

0 comments on commit d3ee420

Please sign in to comment.