Changeset 46214 for trunk/src/wp-includes/formatting.php

Timestamp:

09/20/2019 10:01:36 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove all code using a version_compare() with a PHP version older than PHP 5.6.

Props jrf.
Fixes #48074.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -5573 +5573 @@
  */
 function wp_encode_emoji( $content ) {
-    $emoji  = _wp_emoji_list( 'partials' );
-    $compat = version_compare( phpversion(), '5.4', '<' );
+    $emoji = _wp_emoji_list( 'partials' );
 
     foreach ( $emoji as $emojum ) {
-        if ( $compat ) {
-            $emoji_char = html_entity_decode( $emojum, ENT_COMPAT, 'UTF-8' );
-        } else {
-            $emoji_char = html_entity_decode( $emojum );
-        }
+        $emoji_char = html_entity_decode( $emojum );
         if ( false !== strpos( $content, $emoji_char ) ) {
             $content = preg_replace( "/$emoji_char/", $emojum, $content );
@@ -5617 +5612 @@
     // Quickly narrow down the list of emoji that might be in the text and need replacing.
     $possible_emoji = array();
-    $compat         = version_compare( phpversion(), '5.4', '<' );
     foreach ( $emoji as $emojum ) {
         if ( false !== strpos( $text, $emojum ) ) {
-            if ( $compat ) {
-                $possible_emoji[ $emojum ] = html_entity_decode( $emojum, ENT_COMPAT, 'UTF-8' );
-            } else {
-                $possible_emoji[ $emojum ] = html_entity_decode( $emojum );
-            }
+            $possible_emoji[ $emojum ] = html_entity_decode( $emojum );
         }
     }