Ticket #44339: 44339.4.diff
File 44339.4.diff, 8.3 KB (added by , 6 years ago) |
---|
-
package-lock.json
3596 3596 "version": "0.0.9", 3597 3597 "bundled": true, 3598 3598 "dev": true, 3599 "optional": true, 3599 3600 "requires": { 3600 3601 "inherits": "~2.0.0" 3601 3602 } … … 3620 3621 "buffer-shims": { 3621 3622 "version": "1.0.0", 3622 3623 "bundled": true, 3623 "dev": true 3624 "dev": true, 3625 "optional": true 3624 3626 }, 3625 3627 "caseless": { 3626 3628 "version": "0.12.0", … … 3637 3639 "code-point-at": { 3638 3640 "version": "1.1.0", 3639 3641 "bundled": true, 3640 "dev": true 3642 "dev": true, 3643 "optional": true 3641 3644 }, 3642 3645 "combined-stream": { 3643 3646 "version": "1.0.5", 3644 3647 "bundled": true, 3645 3648 "dev": true, 3649 "optional": true, 3646 3650 "requires": { 3647 3651 "delayed-stream": "~1.0.0" 3648 3652 } … … 3655 3659 "console-control-strings": { 3656 3660 "version": "1.1.0", 3657 3661 "bundled": true, 3658 "dev": true 3662 "dev": true, 3663 "optional": true 3659 3664 }, 3660 3665 "core-util-is": { 3661 3666 "version": "1.0.2", 3662 3667 "bundled": true, 3663 "dev": true 3668 "dev": true, 3669 "optional": true 3664 3670 }, 3665 3671 "cryptiles": { 3666 3672 "version": "2.0.5", 3667 3673 "bundled": true, 3668 3674 "dev": true, 3675 "optional": true, 3669 3676 "requires": { 3670 3677 "boom": "2.x.x" 3671 3678 } … … 3705 3712 "delayed-stream": { 3706 3713 "version": "1.0.0", 3707 3714 "bundled": true, 3708 "dev": true 3715 "dev": true, 3716 "optional": true 3709 3717 }, 3710 3718 "delegates": { 3711 3719 "version": "1.0.0", … … 3737 3745 "extsprintf": { 3738 3746 "version": "1.0.2", 3739 3747 "bundled": true, 3740 "dev": true 3748 "dev": true, 3749 "optional": true 3741 3750 }, 3742 3751 "forever-agent": { 3743 3752 "version": "0.6.1", … … 3860 3869 "version": "3.1.3", 3861 3870 "bundled": true, 3862 3871 "dev": true, 3872 "optional": true, 3863 3873 "requires": { 3864 3874 "boom": "2.x.x", 3865 3875 "cryptiles": "2.x.x", … … 3907 3917 "version": "1.0.0", 3908 3918 "bundled": true, 3909 3919 "dev": true, 3920 "optional": true, 3910 3921 "requires": { 3911 3922 "number-is-nan": "^1.0.0" 3912 3923 } … … 3920 3931 "isarray": { 3921 3932 "version": "1.0.0", 3922 3933 "bundled": true, 3923 "dev": true 3934 "dev": true, 3935 "optional": true 3924 3936 }, 3925 3937 "isstream": { 3926 3938 "version": "0.1.2", … … 3993 4005 "mime-db": { 3994 4006 "version": "1.27.0", 3995 4007 "bundled": true, 3996 "dev": true 4008 "dev": true, 4009 "optional": true 3997 4010 }, 3998 4011 "mime-types": { 3999 4012 "version": "2.1.15", 4000 4013 "bundled": true, 4001 4014 "dev": true, 4015 "optional": true, 4002 4016 "requires": { 4003 4017 "mime-db": "~1.27.0" 4004 4018 } … … 4074 4088 "number-is-nan": { 4075 4089 "version": "1.0.1", 4076 4090 "bundled": true, 4077 "dev": true 4091 "dev": true, 4092 "optional": true 4078 4093 }, 4079 4094 "oauth-sign": { 4080 4095 "version": "0.8.2", … … 4132 4147 "process-nextick-args": { 4133 4148 "version": "1.0.7", 4134 4149 "bundled": true, 4135 "dev": true 4150 "dev": true, 4151 "optional": true 4136 4152 }, 4137 4153 "punycode": { 4138 4154 "version": "1.4.1", … … 4170 4186 "version": "2.2.9", 4171 4187 "bundled": true, 4172 4188 "dev": true, 4189 "optional": true, 4173 4190 "requires": { 4174 4191 "buffer-shims": "~1.0.0", 4175 4192 "core-util-is": "~1.0.0", … … 4221 4238 "safe-buffer": { 4222 4239 "version": "5.0.1", 4223 4240 "bundled": true, 4224 "dev": true 4241 "dev": true, 4242 "optional": true 4225 4243 }, 4226 4244 "semver": { 4227 4245 "version": "5.3.0", … … 4245 4263 "version": "1.0.9", 4246 4264 "bundled": true, 4247 4265 "dev": true, 4266 "optional": true, 4248 4267 "requires": { 4249 4268 "hoek": "2.x.x" 4250 4269 } … … 4278 4297 "version": "1.0.2", 4279 4298 "bundled": true, 4280 4299 "dev": true, 4300 "optional": true, 4281 4301 "requires": { 4282 4302 "code-point-at": "^1.0.0", 4283 4303 "is-fullwidth-code-point": "^1.0.0", … … 4288 4308 "version": "1.0.1", 4289 4309 "bundled": true, 4290 4310 "dev": true, 4311 "optional": true, 4291 4312 "requires": { 4292 4313 "safe-buffer": "^5.0.1" 4293 4314 } … … 4316 4337 "version": "2.2.1", 4317 4338 "bundled": true, 4318 4339 "dev": true, 4340 "optional": true, 4319 4341 "requires": { 4320 4342 "block-stream": "*", 4321 4343 "fstream": "^1.0.2", … … 4371 4393 "util-deprecate": { 4372 4394 "version": "1.0.2", 4373 4395 "bundled": true, 4374 "dev": true 4396 "dev": true, 4397 "optional": true 4375 4398 }, 4376 4399 "uuid": { 4377 4400 "version": "3.0.1", … … 10696 10719 "optional": true 10697 10720 }, 10698 10721 "twemoji": { 10699 "version": " 2.5.1",10700 "resolved": "https://registry.npmjs.org/twemoji/-/twemoji- 2.5.1.tgz",10701 "integrity": "sha1- KWZHxhY8fwR0WIccKuviXqj/6DQ="10722 "version": "11.0.0", 10723 "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-11.0.0.tgz", 10724 "integrity": "sha1-fuxX0Sv9H//o1efwXaC2QipgeQ8=" 10702 10725 }, 10703 10726 "type-is": { 10704 10727 "version": "1.6.16", -
package.json
53 53 "jquery-hoverintent": "1.8.3", 54 54 "jquery-ui": "github:jquery/jquery-ui#1.11.4", 55 55 "masonry-layout": "3.3.2", 56 "twemoji": " 2.5.1",56 "twemoji": "11.0.0", 57 57 "underscore": "1.8.3" 58 58 } 59 59 } -
src/js/_enqueues/lib/emoji-loader.js
99 99 return ! isIdentical; 100 100 case 'emoji': 101 101 /* 102 * Emoji allows people of all gender levitate and so does WordPress.102 * She's the hero Emoji deserves, but not the one it needs right now. 103 103 * 104 * To test for support, try to render a new emoji ( woman in business suit levitating),104 * To test for support, try to render a new emoji (female superhero), 105 105 * then compare it to how it would look if the browser doesn't render it correctly 106 * ( person in business suit levitating + female sign).106 * (superhero + female sign) . 107 107 */ 108 108 isIdentical = emojiSetsRenderIdentically( 109 [5535 7, 56692, 8205, 9792, 65039],110 [5535 7, 56692, 8203, 9792, 65039]109 [55358, 56760, 9792, 65039], 110 [55358, 56760, 8203, 9792, 65039] 111 111 ); 112 112 113 return ! isIdentical; 113 114 } 114 115 -
src/wp-includes/formatting.php
5388 5388 * 5389 5389 * @param string The emoji base URL for png images. 5390 5390 */ 5391 'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/ 2.4/72x72/' ),5391 'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/11/72x72/' ), 5392 5392 5393 5393 /** 5394 5394 * Filters the extension of the emoji png files. … … 5406 5406 * 5407 5407 * @param string The emoji base URL for svg images. 5408 5408 */ 5409 'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/ 2.4/svg/' ),5409 'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/11/svg/' ), 5410 5410 5411 5411 /** 5412 5412 * Filters the extension of the emoji SVG files. -
src/wp-includes/general-template.php
2937 2937 * The path is removed in the foreach loop below. 2938 2938 */ 2939 2939 /** This filter is documented in wp-includes/formatting.php */ 2940 $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/ 2.4/svg/' );2940 $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/11/svg/' ); 2941 2941 2942 2942 foreach ( $hints as $relation_type => $urls ) { 2943 2943 $unique_urls = array(); -
tests/phpunit/tests/formatting/Emoji.php
6 6 */ 7 7 class Tests_Formatting_Emoji extends WP_UnitTestCase { 8 8 9 private $png_cdn = 'https://s.w.org/images/core/emoji/ 2.4/72x72/';10 private $svn_cdn = 'https://s.w.org/images/core/emoji/ 2.4/svg/';9 private $png_cdn = 'https://s.w.org/images/core/emoji/11/72x72/'; 10 private $svn_cdn = 'https://s.w.org/images/core/emoji/11/svg/'; 11 11 12 12 /** 13 13 * @ticket 36525