Changeset 3429

Timestamp:

01/13/2006 07:28:47 AM (19 years ago)

Author:

ryan

Message:

kses regex tweakage for better comment filtering. fixes #2130

File:

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

trunk/wp-includes/kses.php

@@ -78 +78 @@
 ###############################################################################
 {
-    return preg_replace('%(<!--.*?-->)|(<'.# EITHER: <
-    '[^>]*'.# things that aren't >
-    '(>|$)'.# > or end of string
-    '|>)%e', # OR: just a >
+    return preg_replace('%((<!--.*?(-->|$))|(<[^>]*(>|$)|>))%e',
     "wp_kses_split2('\\1', \$allowed_html, ".'$allowed_protocols)', $string);
 } # function wp_kses_split
@@ -99 +96 @@
     # It matched a ">" character
 
-    if (preg_match('%^<!--(.*)-->$%', $string, $matches)) {
-        $string = $matches[1];
+    if (preg_match('%^<!--(.*?)(-->)?$%', $string, $matches)) {
+        $string = str_replace(array('<!--', '-->'), '', $matches[1]);
         while ( $string != $newstring = wp_kses($string, $allowed_html, $allowed_protocols) )
             $string = $newstring;
+        if ( $string == '' )
+            return '';
         return "<!--{$string}-->";
     }