X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/bf5c68485ef07868ad0a91168ecd0092af7661ae..e08b42e8ad054ec67522d7ac1aaae5dc68cb3d01:/wp-includes/kses.php?ds=sidebyside

diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index c54029ca..531e6efe 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -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
@@ -34,6 +34,11 @@
 /**
  * You can override this in a plugin.
  *
+ * The wp_kses_allowed_html filter is more powerful and supplies context.
+ * CUSTOM_TAGS is not recommended and should be considered deprecated.
+ *
+ * @see wp_kses_allowed_html()
+ *
  * @since 1.2.0
  */
 if ( ! defined( 'CUSTOM_TAGS' ) )
@@ -51,348 +56,318 @@ 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()),
-		'abbr' => array(
-			'class' => array (),
-			'title' => array ()),
-		'acronym' => array(
-			'title' => array ()),
+			'href' => true,
+			'rel' => true,
+			'rev' => true,
+			'name' => true,
+			'target' => true,
+		),
+		'abbr' => array(),
+		'acronym' => array(),
+		'area' => array(
+			'alt' => true,
+			'coords' => true,
+			'href' => true,
+			'nohref' => true,
+			'shape' => true,
+			'target' => true,
+		),
 		'article' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
 		),
 		'aside' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
 		),
 		'b' => array(),
 		'big' => array(),
 		'blockquote' => array(
-			'id' => array (),
-			'cite' => array (),
-			'class' => array(),
-			'lang' => array(),
-			'xml:lang' => array()),
-		'br' => array (
-			'class' => array ()),
+			'cite' => true,
+			'lang' => true,
+			'xml:lang' => true,
+		),
+		'br' => array(),
 		'button' => array(
-			'disabled' => array (),
-			'name' => array (),
-			'type' => array (),
-			'value' => array ()),
+			'disabled' => true,
+			'name' => true,
+			'type' => true,
+			'value' => true,
+		),
 		'caption' => array(
-			'align' => array (),
-			'class' => array ()),
-		'cite' => array (
-			'class' => array(),
-			'dir' => array(),
-			'lang' => array(),
-			'title' => array ()),
-		'code' => array (
-			'style' => array()),
+			'align' => true,
+		),
+		'cite' => array(
+			'dir' => true,
+			'lang' => true,
+		),
+		'code' => array(),
 		'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,
+			'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,
+			'dir' => true,
+			'lang' => true,
+			'open' => true,
+			'xml:lang' => true,
 		),
 		'div' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array()),
+			'align' => true,
+			'dir' => true,
+			'lang' => 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,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
 		),
 		'figcaption' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => 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,
+			'dir' => true,
+			'lang' => 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 ()),
-		'h2' => array (
-			'align' => array (),
-			'class' => array (),
-			'id'    => array (),
-			'style' => array ()),
-		'h3' => array (
-			'align' => array (),
-			'class' => array (),
-			'id'    => array (),
-			'style' => array ()),
-		'h4' => array (
-			'align' => array (),
-			'class' => array (),
-			'id'    => array (),
-			'style' => array ()),
-		'h5' => array (
-			'align' => array (),
-			'class' => array (),
-			'id'    => array (),
-			'style' => array ()),
-		'h6' => array (
-			'align' => array (),
-			'class' => array (),
-			'id'    => array (),
-			'style' => array ()),
+			'align' => true,
+		),
+		'h2' => array(
+			'align' => true,
+		),
+		'h3' => array(
+			'align' => true,
+		),
+		'h4' => array(
+			'align' => true,
+		),
+		'h5' => array(
+			'align' => true,
+		),
+		'h6' => array(
+			'align' => true,
+		),
 		'header' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
 		),
 		'hgroup' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
+		),
+		'hr' => array(
+			'align' => true,
+			'noshade' => true,
+			'size' => true,
+			'width' => true,
 		),
-		'hr' => array (
-			'align' => array (),
-			'class' => array (),
-			'noshade' => array (),
-			'size' => array (),
-			'width' => array ()),
 		'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,
+			'height' => true,
+			'hspace' => true,
+			'longdesc' => true,
+			'vspace' => true,
+			'src' => true,
+			'usemap' => 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 ()),
-		'li' => array (
-			'align' => array (),
-			'class' => array ()),
-		'menu' => array (
-			'class' => array (),
-			'style' => array (),
-			'type' => array ()),
+			'align' => true,
+		),
+		'li' => array(
+			'align' => true,
+			'value' => true,
+		),
+		'map' => array(
+			'name' => true,
+		),
+		'menu' => array(
+			'type' => true,
+		),
 		'nav' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
 		),
 		'p' => array(
-			'class' => array (),
-			'align' => array (),
-			'dir' => array(),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array()),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
+		),
 		'pre' => array(
-			'style' => array(),
-			'width' => array ()),
+			'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()),
+		'span' => array(
+			'dir' => true,
+			'align' => true,
+			'lang' => true,
+			'xml:lang' => true,
+		),
 		'section' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => true,
+			'xml:lang' => true,
 		),
+		'small' => array(),
 		'strike' => array(),
 		'strong' => array(),
 		'sub' => array(),
 		'summary' => array(
-			'align' => array (),
-			'class' => array (),
-			'dir' => array (),
-			'lang' => array(),
-			'style' => array (),
-			'xml:lang' => array(),
+			'align' => true,
+			'dir' => true,
+			'lang' => 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,
+			'dir' => true,
+			'rules' => 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,
+			'colspan' => true,
+			'dir' => true,
+			'headers' => true,
+			'height' => true,
+			'nowrap' => true,
+			'rowspan' => true,
+			'scope' => 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,
+			'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,
+			'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,
+			'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,
+			'valign' => true,
+		),
 		'tt' => array(),
 		'u' => array(),
-		'ul' => array (
-			'class' => array (),
-			'style' => array (),
-			'type' => array ()),
-		'ol' => array (
-			'class' => array (),
-			'start' => array (),
-			'style' => array (),
-			'type' => array ()),
-		'var' => array ());
+		'ul' => array(
+			'type' => true,
+		),
+		'ol' => array(
+			'start' => true,
+			'type' => true,
+		),
+		'var' => array(),
+	);
 
 	/**
 	 * Kses allowed HTML elements.
@@ -402,36 +377,31 @@ 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 ()),
-		//	'br' => array(),
-		'cite' => array (),
+			'cite' => true,
+		),
+		'cite' => array(),
 		'code' => array(),
 		'del' => array(
-			'datetime' => array ()),
-		//	'dd' => array(),
-		//	'dl' => array(),
-		//	'dt' => array(),
-		'em' => array (), 'i' => array (),
-		//	'ins' => array('datetime' => array(), 'cite' => array()),
-		//	'li' => array(),
-		//	'ol' => array(),
-		//	'p' => array(),
+			'datetime' => true,
+		),
+		'em' => array(),
+		'i' => array(),
 		'q' => array(
-			'cite' => array ()),
+			'cite' => true,
+		),
 		'strike' => array(),
 		'strong' => array(),
-		//	'sub' => array(),
-		//	'sup' => array(),
-		//	'u' => array(),
-		//	'ul' => array(),
 	);
 
 	$allowedentitynames = array(
@@ -476,7 +446,14 @@ if ( ! CUSTOM_TAGS ) {
 		'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
 		'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
 		'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
+		'sup1',    'sup2',   'sup3',    'frac14', 'frac12', 'frac34',
+		'there4',
 	);
+
+	$allowedposttags = array_map( '_wp_add_global_attributes', $allowedposttags );
+} else {
+	$allowedtags = wp_kses_array_lc( $allowedtags );
+	$allowedposttags = wp_kses_array_lc( $allowedposttags );
 }
 
 /**
@@ -499,15 +476,51 @@ if ( ! CUSTOM_TAGS ) {
  * @param array $allowed_protocols Optional. Allowed protocol in links.
  * @return string Filtered content with only allowed HTML elements
  */
-function wp_kses($string, $allowed_html, $allowed_protocols = array ()) {
+function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
 	if ( empty( $allowed_protocols ) )
 		$allowed_protocols = wp_allowed_protocols();
 	$string = wp_kses_no_null($string);
 	$string = wp_kses_js_entities($string);
 	$string = wp_kses_normalize_entities($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);
+	$string = wp_kses_hook($string, $allowed_html, $allowed_protocols); // WP changed the order of these funcs and added args to wp_kses_hook
+	return wp_kses_split($string, $allowed_html, $allowed_protocols);
+}
+
+/**
+ * Return a list of allowed tags and attributes for a given context.
+ *
+ * @since 3.5.0
+ *
+ * @param string $context The context for which to retrieve tags. Allowed values are
+ *  post | strip | data | entities or the name of a field filter such as pre_user_description.
+ * @return array List of allowed tags and their allowed attributes.
+ */
+function wp_kses_allowed_html( $context = '' ) {
+	global $allowedposttags, $allowedtags, $allowedentitynames;
+
+	if ( is_array( $context ) )
+		return apply_filters( 'wp_kses_allowed_html', $context, 'explicit' );
+
+	switch ( $context ) {
+		case 'post':
+			return apply_filters( 'wp_kses_allowed_html', $allowedposttags, $context );
+			break;
+		case 'user_description':
+		case 'pre_user_description':
+			$tags = $allowedtags;
+			$tags['a']['rel'] = true;
+			return apply_filters( 'wp_kses_allowed_html', $tags, $context );
+			break;
+		case 'strip':
+			return apply_filters( 'wp_kses_allowed_html', array(), $context );
+			break;
+		case 'entities':
+			return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context);
+			break;
+		case 'data':
+		default:
+			return apply_filters( 'wp_kses_allowed_html', $allowedtags, $context );
+	}
 }
 
 /**
@@ -523,7 +536,7 @@ function wp_kses($string, $allowed_html, $allowed_protocols = array ()) {
  * @param array $allowed_protocols Allowed protocol in links
  * @return string Filtered content through 'pre_kses' hook
  */
-function wp_kses_hook($string, $allowed_html, $allowed_protocols) {
+function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) {
 	$string = apply_filters('pre_kses', $string, $allowed_html, $allowed_protocols);
 	return $string;
 }
@@ -551,7 +564,7 @@ function wp_kses_version() {
  * @param array $allowed_protocols Allowed protocols to keep
  * @return string Content with fixed HTML tags
  */
-function wp_kses_split($string, $allowed_html, $allowed_protocols) {
+function wp_kses_split( $string, $allowed_html, $allowed_protocols ) {
 	global $pass_allowed_html, $pass_allowed_protocols;
 	$pass_allowed_html = $allowed_html;
 	$pass_allowed_protocols = $allowed_protocols;
@@ -619,6 +632,9 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
 	$elem = $matches[2];
 	$attrlist = $matches[3];
 
+	if ( ! is_array( $allowed_html ) )
+		$allowed_html = wp_kses_allowed_html( $allowed_html );
+
 	if ( ! isset($allowed_html[strtolower($elem)]) )
 		return '';
 	# They are using a not allowed HTML element
@@ -650,6 +666,9 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
 function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
 	# Is there a closing XHTML slash at the end of the attributes?
 
+	if ( ! is_array( $allowed_html ) )
+		$allowed_html = wp_kses_allowed_html( $allowed_html );
+
 	$xhtml_slash = '';
 	if (preg_match('%\s*/\s*$%', $attr))
 		$xhtml_slash = ' /';
@@ -674,6 +693,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 +718,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 +737,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
@@ -728,7 +747,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
  * @return array List of attributes after parsing
  */
 function wp_kses_hair($attr, $allowed_protocols) {
-	$attrarr = array ();
+	$attrarr = array();
 	$mode = 0;
 	$attrname = '';
 	$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
@@ -763,7 +782,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 +799,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 +815,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 +831,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 +850,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');
@@ -941,7 +960,7 @@ function wp_kses_bad_protocol($string, $allowed_protocols) {
 }
 
 /**
- * Removes any NULL characters in $string.
+ * Removes any null characters in $string.
  *
  * @since 1.0.0
  *
@@ -1102,7 +1121,7 @@ function wp_kses_normalize_entities($string) {
 
 	# 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('/&([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $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);
 
@@ -1237,9 +1256,8 @@ function _wp_kses_decode_entities_chr_hexdec( $match ) {
  * @param string $data Content to filter, expected to be escaped with slashes
  * @return string Filtered content
  */
-function wp_filter_kses($data) {
-	global $allowedtags;
-	return addslashes( wp_kses(stripslashes( $data ), $allowedtags) );
+function wp_filter_kses( $data ) {
+	return addslashes( wp_kses( stripslashes( $data ), current_filter() ) );
 }
 
 /**
@@ -1251,9 +1269,8 @@ function wp_filter_kses($data) {
  * @param string $data Content to filter, expected to not be escaped
  * @return string Filtered content
  */
-function wp_kses_data($data) {
-	global $allowedtags;
-	return wp_kses( $data , $allowedtags );
+function wp_kses_data( $data ) {
+	return wp_kses( $data , current_filter() );
 }
 
 /**
@@ -1263,14 +1280,12 @@ function wp_kses_data($data) {
  * data from forms.
  *
  * @since 2.0.0
- * @uses $allowedposttags
  *
  * @param string $data Post content to filter, expected to be escaped with slashes
  * @return string Filtered post content with allowed HTML tags and attributes intact.
  */
 function wp_filter_post_kses($data) {
-	global $allowedposttags;
-	return addslashes ( wp_kses(stripslashes( $data ), $allowedposttags) );
+	return addslashes ( wp_kses( stripslashes( $data ), 'post' ) );
 }
 
 /**
@@ -1280,14 +1295,12 @@ function wp_filter_post_kses($data) {
  * data from forms.
  *
  * @since 2.9.0
- * @uses $allowedposttags
  *
  * @param string $data Post content to filter
  * @return string Filtered post content with allowed HTML tags and attributes intact.
  */
 function wp_kses_post($data) {
-	global $allowedposttags;
-	return wp_kses( $data , $allowedposttags );
+	return wp_kses( $data , 'post' );
 }
 
 /**
@@ -1298,8 +1311,8 @@ function wp_kses_post($data) {
  * @param string $data Content to strip all HTML from
  * @return string Filtered content without any HTML
  */
-function wp_filter_nohtml_kses($data) {
-	return addslashes ( wp_kses(stripslashes( $data ), array()) );
+function wp_filter_nohtml_kses( $data ) {
+	return addslashes ( wp_kses( stripslashes( $data ), 'strip' ) );
 }
 
 /**
@@ -1315,10 +1328,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');
@@ -1338,10 +1356,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');
@@ -1414,7 +1435,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;
 		}
@@ -1427,3 +1448,29 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 
 	return $css;
 }
+
+/**
+ * Helper function to add global attributes to a tag in the allowed html list.
+ *
+ * @since 3.5.0
+ * @access private
+ *
+ * @param array $value An array of attributes.
+ * @return array The array of attributes with global attributes added.
+ */
+function _wp_add_global_attributes( $value ) {
+	$global_attributes = array(
+		'class' => true,
+		'id' => true,
+		'style' => true,
+		'title' => true,
+	);
+
+	if ( true === $value )
+		$value = array();
+
+	if ( is_array( $value ) )
+		return array_merge( $value, $global_attributes );
+
+	return $value;
+}