Changeset 13648

Timestamp:

03/10/2010 06:45:28 PM (15 years ago)

Author:

ryan

Message:

Fix numeric entity logic in kses. Props miqrogroove. see #12284

File:

• trunk/wp-includes/kses.php (modified) (3 diffs)

trunk/wp-includes/kses.php

@@ -997 +997 @@
 
     $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;
@@ -1041 +1041 @@
 
     $i = $matches[1];
-    return ( ( ! valid_unicode($i) ) || ($i > 65535) ? "&#$i;" : "&#$i;" );
+    if (valid_unicode($i)) {
+        $i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+        $i = "&#$i;";
+    } else {
+        $i = "&#$i;";
+    }
+
+    return $i;
 }
 
@@ -1056 +1063 @@
  */
 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').';' );
 }