Ticket #10823: 10823.3.diff

wp-includes/formatting.php

@@ -821 +821 @@
         $username = remove_accents( $username );
         // Kill octets
         $username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
-        $username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
+        $username = preg_replace( '/&#?\w+;/', '', $username ); // Kill entities
 
         // If strict, reduce to ASCII for max portability.
         if ( $strict )
@@ -905 +905 @@
         // Restore octets.
         $title = preg_replace('|---([a-fA-F0-9][a-fA-F0-9])---|', '%$1', $title);
 
-        if (seems_utf8($title)) {
-                if (function_exists('mb_strtolower')) {
-                        $title = mb_strtolower($title, 'UTF-8');
-                }
-                $title = utf8_uri_encode($title, 200);
+        if ( seems_utf8( $title ) ) {
+                if ( function_exists( 'mb_strtolower' ) )
+                        $title = mb_strtolower( $title, 'UTF-8' );
+
+                $title = utf8_uri_encode( $title, 200 );
         }
 
-        $title = strtolower($title);
-        $title = preg_replace('/&.+?;/', '', $title); // kill entities
-        $title = str_replace('.', '-', $title);
+        $title = strtolower( $title );
+        $title = preg_replace( '/&#?\w+;/', '', $title ); // kill entities
+        $title = str_replace( '.', '-', $title );
 
         if ( 'save' == $context ) {
                 // nbsp, ndash and mdash