sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emoji: Fix incorrect emoji encoding in PHP < 5.4.

Browse Source 
[41701] included a bug with PHP < 5.4. Prior to then, `html_entity_decode()` decoded into `ISO-8859-1`, when we actually need it to use `UTF-8`.

Fixes #35293.



git-svn-id: https://develop.svn.wordpress.org/trunk@41702 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2017-10-03 09:56:45 +00:00
parent d3e0b4bc16
commit d2a011c666
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/formatting.php
View File

@ -5113,7 +5113,11 @@ function wp_encode_emoji( $content ) {
$emoji = _wp_emoji_list( 'partials' ); $emoji = _wp_emoji_list( 'partials' );
foreach ( $emoji as $emojum ) { foreach ( $emoji as $emojum ) {
$emoji_char = html_entity_decode( $emojum ); if ( version_compare( phpversion(), '5.4', '<' ) ) {
$emoji_char = html_entity_decode( $emojum, ENT_COMPAT, 'UTF-8' );
} else {
$emoji_char = html_entity_decode( $emojum );
}
if ( false !== strpos( $content, $emoji_char ) ) { if ( false !== strpos( $content, $emoji_char ) ) {
$content = preg_replace( "/$emoji_char/", $emojum, $content ); $content = preg_replace( "/$emoji_char/", $emojum, $content );
} }
@ -5151,7 +5155,11 @@ function wp_staticize_emoji( $text ) {
$possible_emoji = array(); $possible_emoji = array();
foreach( $emoji as $emojum ) { foreach( $emoji as $emojum ) {
if ( false !== strpos( $text, $emojum ) ) { if ( false !== strpos( $text, $emojum ) ) {
$possible_emoji[ $emojum ] = html_entity_decode( $emojum ); if ( version_compare( phpversion(), '5.4', '<' ) ) {
$possible_emoji[ $emojum ] = html_entity_decode( $emojum, ENT_COMPAT, 'UTF-8' );
} else {
$possible_emoji[ $emojum ] = html_entity_decode( $emojum );
}
} }
} }

12
tests/phpunit/tests/formatting/Emoji.php
View File

@ -122,26 +122,20 @@ class Tests_Formatting_Emoji extends WP_UnitTestCase {
array( array(
// Simple emoji // Simple emoji
'🙂', '🙂',
'<img src="' . $this->png_cdn . '1f642.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />', '<img src="' . $this->png_cdn . '1f642.png" alt="🙂" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
), ),
array( array(
// Skin tone, gender, ZWJ, emoji selector // Skin tone, gender, ZWJ, emoji selector
'👮🏼‍♀️', '👮🏼‍♀️',
'<img src="' . $this->png_cdn . '1f46e-1f3fc-200d-2640-fe0f.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />', '<img src="' . $this->png_cdn . '1f46e-1f3fc-200d-2640-fe0f.png" alt="👮🏼‍♀️" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
), ),
array( array(
// Unicode 10 // Unicode 10
'🧚', '🧚',
'<img src="' . $this->png_cdn . '1f9da.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />', '<img src="' . $this->png_cdn . '1f9da.png" alt="🧚" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
), ),
); );
// Older versions of PHP don't html_entity_decode() emoji, so we need to make sure they're testing in the expected form.
foreach ( $data as $key => $datum ) {
$emoji = html_entity_decode( wp_encode_emoji( $datum[0] ) );
$data[ $key ][1] = str_replace( 'alt=""', 'alt="' . $emoji . '"', $datum[1] );
}
return $data; return $data;
} }