Changeset 5783

Timestamp:

07/06/2007 12:53:15 PM (18 years ago)

Author:

markjaquith

Message:

Entitize lone less-than characters. Props mdawaffe. fixes #4409

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• formatting.php (modified) (1 diff)
• kses.php (modified) (1 diff)

trunk/wp-includes/default-filters.php

@@ -13 +13 @@
 add_filter('the_excerpt', 'wptexturize');
 add_filter('bloginfo', 'wptexturize');
+add_filter('pre_kses', 'wp_pre_kses_less_than');
 
 // Comments, trackbacks, pingbacks

trunk/wp-includes/formatting.php

@@ -1196 +1196 @@
 }
 
+// Convert lone less than signs.  KSES already converts lone greater than signs.
+function wp_pre_kses_less_than( $text ) {
+    return preg_replace_callback('%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text);
+}
+
+function wp_pre_kses_less_than_callback( $matches ) {
+    if ( false === strpos($matches[0], '>') )
+        return wp_specialchars($matches[0]);
+    return $matches[0];
+}
+
 ?>

trunk/wp-includes/kses.php

@@ -231 +231 @@
     $string = wp_kses_js_entities($string);
     $string = wp_kses_normalize_entities($string);
-    $string = wp_kses_hook($string);
     $allowed_html_fixed = wp_kses_array_lc($allowed_html);
+    $string = wp_kses_hook($string, $allowed_html_fixed, $allowed_protocols); // WP changed the order of these funcs and added args to wp_kses_hook
     return wp_kses_split($string, $allowed_html_fixed, $allowed_protocols);
 } # function wp_kses
 
-function wp_kses_hook($string)
+function wp_kses_hook($string, $allowed_html, $allowed_protocols)
 ###############################################################################
 # You add any kses hooks here.
 ###############################################################################
 {
+    $string = apply_filters( 'pre_kses', $string );
     return $string;
 } # function wp_kses_hook