Changeset 41702

Timestamp:

10/03/2017 09:56:45 AM (7 years ago)

Author:

pento

Message:

Emoji: Fix incorrect emoji encoding in PHP < 5.4.

[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.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/Emoji.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -5114 +5114 @@
 
     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 ) ) {
             $content = preg_replace( "/$emoji_char/", $emojum, $content );
@@ -5152 +5156 @@
     foreach( $emoji as $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 );
+            }
         }
     }

trunk/tests/phpunit/tests/formatting/Emoji.php

@@ -123 +123 @@
                 // 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(
                 // 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(
                 // 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;