From cb70ee2e5034d6e70f23175b1fd9dd1b77a890c0 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Wed, 20 Apr 2016 13:55:18 +0000 Subject: [PATCH] Emoji: The diversity support test was incorrectly passing on all browsers. [37028] missed some logic to capture the base emoji skin tone, to compare to the modified emoji skin tone. This caused all browsers to report that they supported skin tone modifiers, regardless of whether they actually did. Fixes #36604 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@37256 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/wp-emoji-loader.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wp-includes/js/wp-emoji-loader.js b/src/wp-includes/js/wp-emoji-loader.js index 0a9f1919b3..f242a12f26 100755 --- a/src/wp-includes/js/wp-emoji-loader.js +++ b/src/wp-includes/js/wp-emoji-loader.js @@ -49,6 +49,7 @@ */ context.fillText( stringFromCharCode( 55356, 57221 ), 0, 0 ); tonedata = context.getImageData( 16, 16, 1, 1 ).data; + tone = tonedata[0] + ',' + tonedata[1] + ',' + tonedata[2] + ',' + tonedata[3]; context.fillText( stringFromCharCode( 55356, 57221, 55356, 57343 ), 0, 0 ); // Chrome has issues comparing arrays, and Safari has issues converting arrays to strings.