Ticket #31328: 31328.2.patch

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;
 
@@ -792 +800 @@
                         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;
                         }
@@ -1266 +1272 @@
         // Restore octets.
         $title = preg_replace('|---([a-fA-F0-9][a-fA-F0-9])---|', '%$1', $title);
 
+        if ( 'save' === $context ) {
+                // Strip Emoticons
+                $title = preg_replace( '/[\x{1F600}-\x{1F64F}]/u', '', $title );
+
+                // Strip Miscellaneous Symbols and Pictographs
+                $title = preg_replace( '/[\x{1F300}-\x{1F5FF}]/u', '', $title );
+
+                // Strip Transport And Map Symbols
+                $title = preg_replace( '/[\x{1F680}-\x{1F6FF}]/u', '', $title );
+
+                // Strip Miscellaneous Symbols
+                $title = preg_replace( '/[\x{2600}-\x{26FF}]/u', '', $title );
+
+                // Strip Dingbats
+                $title = preg_replace( '/[\x{2700}-\x{27BF}]/u', '', $title );
+        }
+
         if (seems_utf8($title)) {
                 if (function_exists('mb_strtolower')) {
                         $title = mb_strtolower($title, 'UTF-8');
@@ -1277 +1300 @@
         $title = preg_replace('/&.+?;/', '', $title); // kill entities
         $title = str_replace('.', '-', $title);
 
-        if ( 'save' == $context ) {
+        if ( 'save' === $context ) {
                 // Convert nbsp, ndash and mdash to hyphens
                 $title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );