]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-includes/kses.php
WordPress 3.4
[autoinstalls/wordpress.git] / wp-includes / kses.php
index d76b34482b398a7ce315a0e94f6dcfeca8aa5bb0..b9f13face0d4120acf5ef663840b1d8b3ce46272 100644 (file)
@@ -10,7 +10,7 @@
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
  * You should have received a copy of the GNU General Public License along
@@ -51,348 +51,390 @@ if ( ! CUSTOM_TAGS ) {
        $allowedposttags = array(
                'address' => array(),
                'a' => array(
-                       'class' => array (),
-                       'href' => array (),
-                       'id' => array (),
-                       'title' => array (),
-                       'rel' => array (),
-                       'rev' => array (),
-                       'name' => array (),
-                       'target' => array()),
+                       'class' => true,
+                       'href' => true,
+                       'id' => true,
+                       'title' => true,
+                       'rel' => true,
+                       'rev' => true,
+                       'name' => true,
+                       'target' => true,
+               ),
                'abbr' => array(
-                       'class' => array (),
-                       'title' => array ()),
+                       'class' => true,
+                       'title' => true,
+               ),
                'acronym' => array(
-                       'title' => array ()),
+                       'title' => true,
+               ),
                'article' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'aside' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'b' => array(),
                'big' => array(),
                'blockquote' => array(
-                       'id' => array (),
-                       'cite' => array (),
-                       'class' => array(),
-                       'lang' => array(),
-                       'xml:lang' => array()),
+                       'id' => true,
+                       'cite' => true,
+                       'class' => true,
+                       'lang' => true,
+                       'xml:lang' => true,
+               ),
                'br' => array (
-                       'class' => array ()),
+                       'class' => true,
+               ),
                'button' => array(
-                       'disabled' => array (),
-                       'name' => array (),
-                       'type' => array (),
-                       'value' => array ()),
+                       'disabled' => true,
+                       'name' => true,
+                       'type' => true,
+                       'value' => true,
+               ),
                'caption' => array(
-                       'align' => array (),
-                       'class' => array ()),
+                       'align' => true,
+                       'class' => true,
+               ),
                'cite' => array (
-                       'class' => array(),
-                       'dir' => array(),
-                       'lang' => array(),
-                       'title' => array ()),
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'title' => true,
+               ),
                'code' => array (
-                       'style' => array()),
+                       'style' => true,
+               ),
                'col' => array(
-                       'align' => array (),
-                       'char' => array (),
-                       'charoff' => array (),
-                       'span' => array (),
-                       'dir' => array(),
-                       'style' => array (),
-                       'valign' => array (),
-                       'width' => array ()),
+                       'align' => true,
+                       'char' => true,
+                       'charoff' => true,
+                       'span' => true,
+                       'dir' => true,
+                       'style' => true,
+                       'valign' => true,
+                       'width' => true,
+               ),
                'del' => array(
-                       'datetime' => array ()),
+                       'datetime' => true,
+               ),
                'dd' => array(),
                'details' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'open' => array (),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'open' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'div' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array()),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
+               ),
                'dl' => array(),
                'dt' => array(),
                'em' => array(),
                'fieldset' => array(),
                'figure' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'figcaption' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'font' => array(
-                       'color' => array (),
-                       'face' => array (),
-                       'size' => array ()),
+                       'color' => true,
+                       'face' => true,
+                       'size' => true,
+               ),
                'footer' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'form' => array(
-                       'action' => array (),
-                       'accept' => array (),
-                       'accept-charset' => array (),
-                       'enctype' => array (),
-                       'method' => array (),
-                       'name' => array (),
-                       'target' => array ()),
+                       'action' => true,
+                       'accept' => true,
+                       'accept-charset' => true,
+                       'enctype' => true,
+                       'method' => true,
+                       'name' => true,
+                       'target' => true,
+               ),
                'h1' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'id'    => array (),
-                       'style' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'id'    => true,
+                       'style' => true,
+               ),
                'h2' => array (
-                       'align' => array (),
-                       'class' => array (),
-                       'id'    => array (),
-                       'style' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'id'    => true,
+                       'style' => true,
+               ),
                'h3' => array (
-                       'align' => array (),
-                       'class' => array (),
-                       'id'    => array (),
-                       'style' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'id'    => true,
+                       'style' => true,
+               ),
                'h4' => array (
-                       'align' => array (),
-                       'class' => array (),
-                       'id'    => array (),
-                       'style' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'id'    => true,
+                       'style' => true,
+               ),
                'h5' => array (
-                       'align' => array (),
-                       'class' => array (),
-                       'id'    => array (),
-                       'style' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'id'    => true,
+                       'style' => true,
+               ),
                'h6' => array (
-                       'align' => array (),
-                       'class' => array (),
-                       'id'    => array (),
-                       'style' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'id'    => true,
+                       'style' => true,
+               ),
                'header' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'hgroup' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'hr' => array (
-                       'align' => array (),
-                       'class' => array (),
-                       'noshade' => array (),
-                       'size' => array (),
-                       'width' => array ()),
+                       'align' => true,
+                       'class' => true,
+                       'noshade' => true,
+                       'size' => true,
+                       'width' => true,
+               ),
                'i' => array(),
                'img' => array(
-                       'alt' => array (),
-                       'align' => array (),
-                       'border' => array (),
-                       'class' => array (),
-                       'height' => array (),
-                       'hspace' => array (),
-                       'longdesc' => array (),
-                       'vspace' => array (),
-                       'src' => array (),
-                       'style' => array (),
-                       'width' => array ()),
+                       'alt' => true,
+                       'align' => true,
+                       'border' => true,
+                       'class' => true,
+                       'height' => true,
+                       'hspace' => true,
+                       'longdesc' => true,
+                       'vspace' => true,
+                       'src' => true,
+                       'style' => true,
+                       'width' => true,
+               ),
                'ins' => array(
-                       'datetime' => array (),
-                       'cite' => array ()),
+                       'datetime' => true,
+                       'cite' => true,
+               ),
                'kbd' => array(),
                'label' => array(
-                       'for' => array ()),
+                       'for' => true,
+               ),
                'legend' => array(
-                       'align' => array ()),
+                       'align' => true,
+               ),
                'li' => array (
-                       'align' => array (),
-                       'class' => array ()),
+                       'align' => true,
+                       'class' => true,
+               ),
                'menu' => array (
-                       'class' => array (),
-                       'style' => array (),
-                       'type' => array ()),
+                       'class' => true,
+                       'style' => true,
+                       'type' => true,
+               ),
                'nav' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'p' => array(
-                       'class' => array (),
-                       'align' => array (),
-                       'dir' => array(),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array()),
+                       'class' => true,
+                       'align' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
+               ),
                'pre' => array(
-                       'style' => array(),
-                       'width' => array ()),
+                       'style' => true,
+                       'width' => true,
+               ),
                'q' => array(
-                       'cite' => array ()),
+                       'cite' => true,
+               ),
                's' => array(),
                'span' => array (
-                       'class' => array (),
-                       'dir' => array (),
-                       'align' => array (),
-                       'lang' => array (),
-                       'style' => array (),
-                       'title' => array (),
-                       'xml:lang' => array()),
+                       'class' => true,
+                       'dir' => true,
+                       'align' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'title' => true,
+                       'xml:lang' => true,
+               ),
                'section' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'strike' => array(),
                'strong' => array(),
                'sub' => array(),
                'summary' => array(
-                       'align' => array (),
-                       'class' => array (),
-                       'dir' => array (),
-                       'lang' => array(),
-                       'style' => array (),
-                       'xml:lang' => array(),
+                       'align' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'lang' => true,
+                       'style' => true,
+                       'xml:lang' => true,
                ),
                'sup' => array(),
                'table' => array(
-                       'align' => array (),
-                       'bgcolor' => array (),
-                       'border' => array (),
-                       'cellpadding' => array (),
-                       'cellspacing' => array (),
-                       'class' => array (),
-                       'dir' => array(),
-                       'id' => array(),
-                       'rules' => array (),
-                       'style' => array (),
-                       'summary' => array (),
-                       'width' => array ()),
+                       'align' => true,
+                       'bgcolor' => true,
+                       'border' => true,
+                       'cellpadding' => true,
+                       'cellspacing' => true,
+                       'class' => true,
+                       'dir' => true,
+                       'id' => true,
+                       'rules' => true,
+                       'style' => true,
+                       'summary' => true,
+                       'width' => true,
+               ),
                'tbody' => array(
-                       'align' => array (),
-                       'char' => array (),
-                       'charoff' => array (),
-                       'valign' => array ()),
+                       'align' => true,
+                       'char' => true,
+                       'charoff' => true,
+                       'valign' => true,
+               ),
                'td' => array(
-                       'abbr' => array (),
-                       'align' => array (),
-                       'axis' => array (),
-                       'bgcolor' => array (),
-                       'char' => array (),
-                       'charoff' => array (),
-                       'class' => array (),
-                       'colspan' => array (),
-                       'dir' => array(),
-                       'headers' => array (),
-                       'height' => array (),
-                       'nowrap' => array (),
-                       'rowspan' => array (),
-                       'scope' => array (),
-                       'style' => array (),
-                       'valign' => array (),
-                       'width' => array ()),
+                       'abbr' => true,
+                       'align' => true,
+                       'axis' => true,
+                       'bgcolor' => true,
+                       'char' => true,
+                       'charoff' => true,
+                       'class' => true,
+                       'colspan' => true,
+                       'dir' => true,
+                       'headers' => true,
+                       'height' => true,
+                       'nowrap' => true,
+                       'rowspan' => true,
+                       'scope' => true,
+                       'style' => true,
+                       'valign' => true,
+                       'width' => true,
+               ),
                'textarea' => array(
-                       'cols' => array (),
-                       'rows' => array (),
-                       'disabled' => array (),
-                       'name' => array (),
-                       'readonly' => array ()),
+                       'cols' => true,
+                       'rows' => true,
+                       'disabled' => true,
+                       'name' => true,
+                       'readonly' => true,
+               ),
                'tfoot' => array(
-                       'align' => array (),
-                       'char' => array (),
-                       'class' => array (),
-                       'charoff' => array (),
-                       'valign' => array ()),
+                       'align' => true,
+                       'char' => true,
+                       'class' => true,
+                       'charoff' => true,
+                       'valign' => true,
+               ),
                'th' => array(
-                       'abbr' => array (),
-                       'align' => array (),
-                       'axis' => array (),
-                       'bgcolor' => array (),
-                       'char' => array (),
-                       'charoff' => array (),
-                       'class' => array (),
-                       'colspan' => array (),
-                       'headers' => array (),
-                       'height' => array (),
-                       'nowrap' => array (),
-                       'rowspan' => array (),
-                       'scope' => array (),
-                       'valign' => array (),
-                       'width' => array ()),
+                       'abbr' => true,
+                       'align' => true,
+                       'axis' => true,
+                       'bgcolor' => true,
+                       'char' => true,
+                       'charoff' => true,
+                       'class' => true,
+                       'colspan' => true,
+                       'headers' => true,
+                       'height' => true,
+                       'nowrap' => true,
+                       'rowspan' => true,
+                       'scope' => true,
+                       'valign' => true,
+                       'width' => true,
+               ),
                'thead' => array(
-                       'align' => array (),
-                       'char' => array (),
-                       'charoff' => array (),
-                       'class' => array (),
-                       'valign' => array ()),
+                       'align' => true,
+                       'char' => true,
+                       'charoff' => true,
+                       'class' => true,
+                       'valign' => true,
+               ),
                'title' => array(),
                'tr' => array(
-                       'align' => array (),
-                       'bgcolor' => array (),
-                       'char' => array (),
-                       'charoff' => array (),
-                       'class' => array (),
-                       'style' => array (),
-                       'valign' => array ()),
+                       'align' => true,
+                       'bgcolor' => true,
+                       'char' => true,
+                       'charoff' => true,
+                       'class' => true,
+                       'style' => true,
+                       'valign' => true,
+               ),
                'tt' => array(),
                'u' => array(),
                'ul' => array (
-                       'class' => array (),
-                       'style' => array (),
-                       'type' => array ()),
+                       'class' => true,
+                       'style' => true,
+                       'type' => true,
+               ),
                'ol' => array (
-                       'class' => array (),
-                       'start' => array (),
-                       'style' => array (),
-                       'type' => array ()),
-               'var' => array ());
+                       'class' => true,
+                       'start' => true,
+                       'style' => true,
+                       'type' => true,
+               ),
+               'var' => array(),
+       );
 
        /**
         * Kses allowed HTML elements.
@@ -402,20 +444,25 @@ if ( ! CUSTOM_TAGS ) {
         */
        $allowedtags = array(
                'a' => array(
-                       'href' => array (),
-                       'title' => array ()),
+                       'href' => true,
+                       'title' => true,
+               ),
                'abbr' => array(
-                       'title' => array ()),
+                       'title' => true,
+               ),
                'acronym' => array(
-                       'title' => array ()),
+                       'title' => true,
+               ),
                'b' => array(),
                'blockquote' => array(
-                       'cite' => array ()),
+                       'cite' => true,
+               ),
                //      'br' => array(),
-               'cite' => array (),
+               'cite' => array(),
                'code' => array(),
                'del' => array(
-                       'datetime' => array ()),
+                       'datetime' => true,
+               ),
                //      'dd' => array(),
                //      'dl' => array(),
                //      'dt' => array(),
@@ -425,7 +472,8 @@ if ( ! CUSTOM_TAGS ) {
                //      'ol' => array(),
                //      'p' => array(),
                'q' => array(
-                       'cite' => array ()),
+                       'cite' => true,
+               ),
                'strike' => array(),
                'strong' => array(),
                //      'sub' => array(),
@@ -674,6 +722,17 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
                if ( $current == '' )
                        continue; # the attribute is not allowed
 
+               if ( strtolower( $arreach['name'] ) == 'style' ) {
+                       $orig_value = $arreach['value'];
+                       $value = safecss_filter_attr( $orig_value );
+
+                       if ( empty( $value ) )
+                               continue;
+
+                       $arreach['value'] = $value;
+                       $arreach['whole'] = str_replace( $orig_value, $value, $arreach['whole'] );
+               }
+
                if ( ! is_array($current) ) {
                        $attr2 .= ' '.$arreach['whole'];
                # there are no checks
@@ -688,18 +747,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
                                }
                        }
 
-                       if ( strtolower($arreach['name']) == 'style' ) {
-                               $orig_value = $arreach['value'];
-                               $value = safecss_filter_attr($orig_value);
-
-                               if ( empty($value) )
-                                       continue;
-
-                               $arreach['value'] = $value;
-                               $arreach['whole'] = str_replace($orig_value, $value, $arreach['whole']);
-                       }
-
-                       if ($ok)
+                       if ( $ok )
                                $attr2 .= ' '.$arreach['whole']; # it passed them
                } # if !is_array($current)
        } # foreach
@@ -718,7 +766,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
  * input. It will add quotes around attribute values that don't have any quotes
  * or apostrophes around them, to make it easier to produce HTML code that will
  * conform to W3C's HTML specification. It will also remove bad URL protocols
- * from attribute values.  It also reduces duplicate attributes by using the
+ * from attribute values. It also reduces duplicate attributes by using the
  * attribute defined first (foo='bar' foo='baz' will result in foo='bar').
  *
  * @since 1.0.0
@@ -763,7 +811,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
                                        {
                                        $working = 1;
                                        $mode = 0;
-                                       if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                       if(false === array_key_exists($attrname, $attrarr)) {
                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
                                        }
                                        $attr = preg_replace('/^\s+/', '', $attr);
@@ -780,7 +828,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
                                        if ( in_array(strtolower($attrname), $uris) )
                                                $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-                                       if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                       if(false === array_key_exists($attrname, $attrarr)) {
                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                                        }
                                        $working = 1;
@@ -796,7 +844,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
                                        if ( in_array(strtolower($attrname), $uris) )
                                                $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-                                       if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                       if(false === array_key_exists($attrname, $attrarr)) {
                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
                                        }
                                        $working = 1;
@@ -812,7 +860,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
                                        if ( in_array(strtolower($attrname), $uris) )
                                                $thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
 
-                                       if(FALSE === array_key_exists($attrname, $attrarr)) {
+                                       if(false === array_key_exists($attrname, $attrarr)) {
                                                $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
                                        }
                                        # We add quotes to conform to W3C's HTML spec.
@@ -831,7 +879,7 @@ function wp_kses_hair($attr, $allowed_protocols) {
                }
        } # while
 
-       if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
+       if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
                # special case, for when the attribute list ends with a valueless
                # attribute like "selected"
                $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
@@ -927,18 +975,21 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
  */
 function wp_kses_bad_protocol($string, $allowed_protocols) {
        $string = wp_kses_no_null($string);
-       $string2 = $string.'a';
+       $iterations = 0;
 
-       while ($string != $string2) {
-               $string2 = $string;
+       do {
+               $original_string = $string;
                $string = wp_kses_bad_protocol_once($string, $allowed_protocols);
-       } # while
+       } while ( $original_string != $string && ++$iterations < 6 );
+
+       if ( $original_string != $string )
+               return '';
 
        return $string;
 }
 
 /**
- * Removes any NULL characters in $string.
+ * Removes any null characters in $string.
  *
  * @since 1.0.0
  *
@@ -1031,10 +1082,20 @@ function wp_kses_html_error($string) {
  * @param string $allowed_protocols Allowed protocols
  * @return string Sanitized content
  */
-function wp_kses_bad_protocol_once($string, $allowed_protocols) {
+function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
        $string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
-       if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) )
-               $string = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols ) . trim( $string2[1] );
+       if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) ) {
+               $string = trim( $string2[1] );
+               $protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
+               if ( 'feed:' == $protocol ) {
+                       if ( $count > 2 )
+                               return '';
+                       $string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
+                       if ( empty( $string ) )
+                               return $string;
+               }
+               $string = $protocol . $string;
+       }
 
        return $string;
 }
@@ -1302,10 +1363,15 @@ function wp_filter_nohtml_kses($data) {
  * @uses add_filter() See description for what functions are added to what hooks.
  */
 function kses_init_filters() {
-       // Normal filtering.
-       add_filter('pre_comment_content', 'wp_filter_kses');
+       // Normal filtering
        add_filter('title_save_pre', 'wp_filter_kses');
 
+       // Comment filtering
+       if ( current_user_can( 'unfiltered_html' ) )
+               add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+       else
+               add_filter( 'pre_comment_content', 'wp_filter_kses' );
+
        // Post filtering
        add_filter('content_save_pre', 'wp_filter_post_kses');
        add_filter('excerpt_save_pre', 'wp_filter_post_kses');
@@ -1325,10 +1391,13 @@ function kses_init_filters() {
  * @since 2.0.6
  */
 function kses_remove_filters() {
-       // Normal filtering.
-       remove_filter('pre_comment_content', 'wp_filter_kses');
+       // Normal filtering
        remove_filter('title_save_pre', 'wp_filter_kses');
 
+       // Comment filtering
+       remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+       remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+
        // Post filtering
        remove_filter('content_save_pre', 'wp_filter_post_kses');
        remove_filter('excerpt_save_pre', 'wp_filter_post_kses');
@@ -1401,7 +1470,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
                if ( strpos( $css_item, ':' ) === false ) {
                        $found = true;
                } else {
-                       $parts = split( ':', $css_item );
+                       $parts = explode( ':', $css_item );
                        if ( in_array( trim( $parts[0] ), $allowed_attr ) )
                                $found = true;
                }