Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Reduce memory usage in wp-includes/kses.php by switching unnecessary empty arrays to boolean. Fixes #20017.

Browse Source 
safecss_filter_attr() block for style tags must be moved out of the is_array() only branch of wp_kses_attr() to accommodate for this.


git-svn-id: http://svn.automattic.com/wordpress/trunk@19976 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2012-02-21 20:33:44 +00:00
parent 8ac3015ccf
commit f62dac2756
1 changed files with 331 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

614
wp-includes/kses.php
View File

@ -51,348 +51,390 @@ if ( ! CUSTOM_TAGS ) {
$allowedposttags = array( $allowedposttags = array(
'address' => array(), 'address' => array(),
'a' => array( 'a' => array(
'class' => array (), 'class' => true,
'href' => array (), 'href' => true,
'id' => array (), 'id' => true,
'title' => array (), 'title' => true,
'rel' => array (), 'rel' => true,
'rev' => array (), 'rev' => true,
'name' => array (), 'name' => true,
'target' => array()), 'target' => true,
),
'abbr' => array( 'abbr' => array(
'class' => array (), 'class' => true,
'title' => array ()), 'title' => true,
),
'acronym' => array( 'acronym' => array(
'title' => array ()), 'title' => true,
),
'article' => array( 'article' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'aside' => array( 'aside' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'b' => array(), 'b' => array(),
'big' => array(), 'big' => array(),
'blockquote' => array( 'blockquote' => array(
'id' => array (), 'id' => true,
'cite' => array (), 'cite' => true,
'class' => array(), 'class' => true,
'lang' => array(), 'lang' => true,
'xml:lang' => array()), 'xml:lang' => true,
),
'br' => array ( 'br' => array (
'class' => array ()), 'class' => true,
),
'button' => array( 'button' => array(
'disabled' => array (), 'disabled' => true,
'name' => array (), 'name' => true,
'type' => array (), 'type' => true,
'value' => array ()), 'value' => true,
),
'caption' => array( 'caption' => array(
'align' => array (), 'align' => true,
'class' => array ()), 'class' => true,
),
'cite' => array ( 'cite' => array (
'class' => array(), 'class' => true,
'dir' => array(), 'dir' => true,
'lang' => array(), 'lang' => true,
'title' => array ()), 'title' => true,
),
'code' => array ( 'code' => array (
'style' => array()), 'style' => true,
),
'col' => array( 'col' => array(
'align' => array (), 'align' => true,
'char' => array (), 'char' => true,
'charoff' => array (), 'charoff' => true,
'span' => array (), 'span' => true,
'dir' => array(), 'dir' => true,
'style' => array (), 'style' => true,
'valign' => array (), 'valign' => true,
'width' => array ()), 'width' => true,
),
'del' => array( 'del' => array(
'datetime' => array ()), 'datetime' => true,
),
'dd' => array(), 'dd' => array(),
'details' => array( 'details' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'open' => array (), 'open' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'div' => array( 'div' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array()), 'xml:lang' => true,
),
'dl' => array(), 'dl' => array(),
'dt' => array(), 'dt' => array(),
'em' => array(), 'em' => array(),
'fieldset' => array(), 'fieldset' => array(),
'figure' => array( 'figure' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'figcaption' => array( 'figcaption' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'font' => array( 'font' => array(
'color' => array (), 'color' => true,
'face' => array (), 'face' => true,
'size' => array ()), 'size' => true,
),
'footer' => array( 'footer' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'form' => array( 'form' => array(
'action' => array (), 'action' => true,
'accept' => array (), 'accept' => true,
'accept-charset' => array (), 'accept-charset' => true,
'enctype' => array (), 'enctype' => true,
'method' => array (), 'method' => true,
'name' => array (), 'name' => true,
'target' => array ()), 'target' => true,
),
'h1' => array( 'h1' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'id' => array (), 'id' => true,
'style' => array ()), 'style' => true,
),
'h2' => array ( 'h2' => array (
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'id' => array (), 'id' => true,
'style' => array ()), 'style' => true,
),
'h3' => array ( 'h3' => array (
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'id' => array (), 'id' => true,
'style' => array ()), 'style' => true,
),
'h4' => array ( 'h4' => array (
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'id' => array (), 'id' => true,
'style' => array ()), 'style' => true,
),
'h5' => array ( 'h5' => array (
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'id' => array (), 'id' => true,
'style' => array ()), 'style' => true,
),
'h6' => array ( 'h6' => array (
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'id' => array (), 'id' => true,
'style' => array ()), 'style' => true,
),
'header' => array( 'header' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'hgroup' => array( 'hgroup' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'hr' => array ( 'hr' => array (
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'noshade' => array (), 'noshade' => true,
'size' => array (), 'size' => true,
'width' => array ()), 'width' => true,
),
'i' => array(), 'i' => array(),
'img' => array( 'img' => array(
'alt' => array (), 'alt' => true,
'align' => array (), 'align' => true,
'border' => array (), 'border' => true,
'class' => array (), 'class' => true,
'height' => array (), 'height' => true,
'hspace' => array (), 'hspace' => true,
'longdesc' => array (), 'longdesc' => true,
'vspace' => array (), 'vspace' => true,
'src' => array (), 'src' => true,
'style' => array (), 'style' => true,
'width' => array ()), 'width' => true,
),
'ins' => array( 'ins' => array(
'datetime' => array (), 'datetime' => true,
'cite' => array ()), 'cite' => true,
),
'kbd' => array(), 'kbd' => array(),
'label' => array( 'label' => array(
'for' => array ()), 'for' => true,
),
'legend' => array( 'legend' => array(
'align' => array ()), 'align' => true,
),
'li' => array ( 'li' => array (
'align' => array (), 'align' => true,
'class' => array ()), 'class' => true,
),
'menu' => array ( 'menu' => array (
'class' => array (), 'class' => true,
'style' => array (), 'style' => true,
'type' => array ()), 'type' => true,
),
'nav' => array( 'nav' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'p' => array( 'p' => array(
'class' => array (), 'class' => true,
'align' => array (), 'align' => true,
'dir' => array(), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array()), 'xml:lang' => true,
),
'pre' => array( 'pre' => array(
'style' => array(), 'style' => true,
'width' => array ()), 'width' => true,
),
'q' => array( 'q' => array(
'cite' => array ()), 'cite' => true,
),
's' => array(), 's' => array(),
'span' => array ( 'span' => array (
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'align' => array (), 'align' => true,
'lang' => array (), 'lang' => true,
'style' => array (), 'style' => true,
'title' => array (), 'title' => true,
'xml:lang' => array()), 'xml:lang' => true,
),
'section' => array( 'section' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'strike' => array(), 'strike' => array(),
'strong' => array(), 'strong' => array(),
'sub' => array(), 'sub' => array(),
'summary' => array( 'summary' => array(
'align' => array (), 'align' => true,
'class' => array (), 'class' => true,
'dir' => array (), 'dir' => true,
'lang' => array(), 'lang' => true,
'style' => array (), 'style' => true,
'xml:lang' => array(), 'xml:lang' => true,
), ),
'sup' => array(), 'sup' => array(),
'table' => array( 'table' => array(
'align' => array (), 'align' => true,
'bgcolor' => array (), 'bgcolor' => true,
'border' => array (), 'border' => true,
'cellpadding' => array (), 'cellpadding' => true,
'cellspacing' => array (), 'cellspacing' => true,
'class' => array (), 'class' => true,
'dir' => array(), 'dir' => true,
'id' => array(), 'id' => true,
'rules' => array (), 'rules' => true,
'style' => array (), 'style' => true,
'summary' => array (), 'summary' => true,
'width' => array ()), 'width' => true,
),
'tbody' => array( 'tbody' => array(
'align' => array (), 'align' => true,
'char' => array (), 'char' => true,
'charoff' => array (), 'charoff' => true,
'valign' => array ()), 'valign' => true,
),
'td' => array( 'td' => array(
'abbr' => array (), 'abbr' => true,
'align' => array (), 'align' => true,
'axis' => array (), 'axis' => true,
'bgcolor' => array (), 'bgcolor' => true,
'char' => array (), 'char' => true,
'charoff' => array (), 'charoff' => true,
'class' => array (), 'class' => true,
'colspan' => array (), 'colspan' => true,
'dir' => array(), 'dir' => true,
'headers' => array (), 'headers' => true,
'height' => array (), 'height' => true,
'nowrap' => array (), 'nowrap' => true,
'rowspan' => array (), 'rowspan' => true,
'scope' => array (), 'scope' => true,
'style' => array (), 'style' => true,
'valign' => array (), 'valign' => true,
'width' => array ()), 'width' => true,
),
'textarea' => array( 'textarea' => array(
'cols' => array (), 'cols' => true,
'rows' => array (), 'rows' => true,
'disabled' => array (), 'disabled' => true,
'name' => array (), 'name' => true,
'readonly' => array ()), 'readonly' => true,
),
'tfoot' => array( 'tfoot' => array(
'align' => array (), 'align' => true,
'char' => array (), 'char' => true,
'class' => array (), 'class' => true,
'charoff' => array (), 'charoff' => true,
'valign' => array ()), 'valign' => true,
),
'th' => array( 'th' => array(
'abbr' => array (), 'abbr' => true,
'align' => array (), 'align' => true,
'axis' => array (), 'axis' => true,
'bgcolor' => array (), 'bgcolor' => true,
'char' => array (), 'char' => true,
'charoff' => array (), 'charoff' => true,
'class' => array (), 'class' => true,
'colspan' => array (), 'colspan' => true,
'headers' => array (), 'headers' => true,
'height' => array (), 'height' => true,
'nowrap' => array (), 'nowrap' => true,
'rowspan' => array (), 'rowspan' => true,
'scope' => array (), 'scope' => true,
'valign' => array (), 'valign' => true,
'width' => array ()), 'width' => true,
),
'thead' => array( 'thead' => array(
'align' => array (), 'align' => true,
'char' => array (), 'char' => true,
'charoff' => array (), 'charoff' => true,
'class' => array (), 'class' => true,
'valign' => array ()), 'valign' => true,
),
'title' => array(), 'title' => array(),
'tr' => array( 'tr' => array(
'align' => array (), 'align' => true,
'bgcolor' => array (), 'bgcolor' => true,
'char' => array (), 'char' => true,
'charoff' => array (), 'charoff' => true,
'class' => array (), 'class' => true,
'style' => array (), 'style' => true,
'valign' => array ()), 'valign' => true,
),
'tt' => array(), 'tt' => array(),
'u' => array(), 'u' => array(),
'ul' => array ( 'ul' => array (
'class' => array (), 'class' => true,
'style' => array (), 'style' => true,
'type' => array ()), 'type' => true,
),
'ol' => array ( 'ol' => array (
'class' => array (), 'class' => true,
'start' => array (), 'start' => true,
'style' => array (), 'style' => true,
'type' => array ()), 'type' => true,
'var' => array ()); ),
'var' => array(),
);
/** /**
* Kses allowed HTML elements. * Kses allowed HTML elements.
@ -402,20 +444,25 @@ if ( ! CUSTOM_TAGS ) {
*/ */
$allowedtags = array( $allowedtags = array(
'a' => array( 'a' => array(
'href' => array (), 'href' => true,
'title' => array ()), 'title' => true,
),
'abbr' => array( 'abbr' => array(
'title' => array ()), 'title' => true,
),
'acronym' => array( 'acronym' => array(
'title' => array ()), 'title' => true,
),
'b' => array(), 'b' => array(),
'blockquote' => array( 'blockquote' => array(
'cite' => array ()), 'cite' => true,
),
// 'br' => array(), // 'br' => array(),
'cite' => array (), 'cite' => array(),
'code' => array(), 'code' => array(),
'del' => array( 'del' => array(
'datetime' => array ()), 'datetime' => true,
),
// 'dd' => array(), // 'dd' => array(),
// 'dl' => array(), // 'dl' => array(),
// 'dt' => array(), // 'dt' => array(),
@ -425,7 +472,8 @@ if ( ! CUSTOM_TAGS ) {
// 'ol' => array(), // 'ol' => array(),
// 'p' => array(), // 'p' => array(),
'q' => array( 'q' => array(
'cite' => array ()), 'cite' => true,
),
'strike' => array(), 'strike' => array(),
'strong' => array(), 'strong' => array(),
// 'sub' => array(), // 'sub' => array(),
@ -674,6 +722,17 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
if ( $current == '' ) if ( $current == '' )
continue; # the attribute is not allowed 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) ) { if ( ! is_array($current) ) {
$attr2 .= ' '.$arreach['whole']; $attr2 .= ' '.$arreach['whole'];
# there are no checks # there are no checks
@ -688,18 +747,7 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
} }
} }
if ( strtolower($arreach['name']) == 'style' ) { if ( $ok )
$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)
$attr2 .= ' '.$arreach['whole']; # it passed them $attr2 .= ' '.$arreach['whole']; # it passed them
} # if !is_array($current) } # if !is_array($current)
} # foreach } # foreach