Ticket #12284: 12284-extra.patch

wp-includes/kses.php

@@ -996 +996 @@
         # Change back the allowed entities in our entity whitelist
 
         $string = preg_replace_callback('/&([A-Za-z]{2,8});/', 'wp_kses_named_entities', $string);
-        $string = preg_replace_callback('/&#0*([0-9]{1,5});/', 'wp_kses_normalize_entities2', $string);
-        $string = preg_replace_callback('/&#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', 'wp_kses_normalize_entities3', $string);
+        $string = preg_replace_callback('/&#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string);
+        $string = preg_replace_callback('/&#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string);
 
         return $string;
 }
@@ -1040 +1040 @@
                 return '';
 
         $i = $matches[1];
-        return ( ( ! valid_unicode($i) ) || ($i > 65535) ? "&#$i;" : "&#$i;" );
+        return ( ( ! valid_unicode($i) ) ? "&#$i;" : '&#'.ltrim($i,'0').';' );
 }
 
 /**
@@ -1055 +1055 @@
  * @return string Correctly encoded entity
  */
 function wp_kses_normalize_entities3($matches) {
-        if ( empty($matches[2]) )
+        if ( empty($matches[1]) )
                 return '';
 
-        $hexchars = $matches[2];
-        return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&#x$hexchars;" : "&#x$hexchars;" );
+        $hexchars = $matches[1];
+        return ( ( ! valid_unicode(hexdec($hexchars)) ) ? "&#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';' );
 }
 
 /**