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

Timestamp:

03/11/2015 10:54:49 PM (11 years ago)

Author:

pento

Message:

Add emoji URL support, and Twemoji fallback for displaying slugs in wp-admin, when the browser doesn't natively support emoji.

Props pento, SergeyBiryukov and boonebgorges.

Fixes #31328

File:

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

trunk/src/wp-includes/formatting.php

@@ -786 +786 @@
             $unicode_length++;
         } else {
-            if ( count( $values ) == 0 ) $num_octets = ( $value < 224 ) ? 2 : 3;
+            if ( count( $values ) == 0 ) {
+                if ( $value < 224 ) {
+                    $num_octets = 2;
+                } elseif ( $value < 240 ) {
+                    $num_octets = 3;
+                } else {
+                    $num_octets = 4;
+                }
+            }
 
             $values[] = $value;
@@ -793 +801 @@
                 break;
             if ( count( $values ) == $num_octets ) {
-                if ($num_octets == 3) {
-                    $unicode .= '%' . dechex($values[0]) . '%' . dechex($values[1]) . '%' . dechex($values[2]);
-                    $unicode_length += 9;
-                } else {
-                    $unicode .= '%' . dechex($values[0]) . '%' . dechex($values[1]);
-                    $unicode_length += 6;
+                for ( $j = 0; $j < $num_octets; $j++ ) {
+                    $unicode .= '%' . dechex( $values[ $j ] );
                 }
+
+                $unicode_length += $num_octets * 3;
 
                 $values = array();