Ticket #31328: 31328.diff

src/wp-includes/formatting.php

@@ -785 +785 @@
                         $unicode .= chr($value);
                         $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;
 
                         if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
                                 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();
                                 $num_octets = 1;
                         }

src/wp-admin/js/post.js

@@ -712 +712 @@
                         revert_slug = real_slug.val(),
                         b = $('#edit-slug-buttons'),
                         revert_b = b.html(),
-                        full = $('#editable-post-name-full').html();
+                        full = $('#editable-post-name-full');
 
+                // Deal with Twemoji in the post-name
+                full.find( 'img' ).replaceWith( function() { return this.alt; } );
+                full = full.html();
+
                 $('#view-post-btn').hide();
                 b.html('<a href="#" class="save button button-small">'+postL10n.ok+'</a> <a class="cancel" href="#">'+postL10n.cancel+'</a>');
                 b.children('.save').click(function() {
@@ -736 +740 @@
                                                 box.removeClass('hidden');
                                         });
                                 }
+
+                                if ( WPEmoji ) {
+                                        WPEmoji.parse( box.get( 0 ) );
+                                }
+
                                 b.html(revert_b);
                                 real_slug.val(new_slug);
                                 $('#view-post-btn').show();