WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't output empty class names or ones with leading/trailing spaces. props MattyRob for the initial patch. fixes #20698. 

git-svn-id: http://core.svn.wordpress.org/trunk@21193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-06-30 11:47:21 +00:00
parent f010e00284
commit 4664d4bed8
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/class-wp-admin-bar.php
View File

@ -237,7 +237,8 @@ class WP_Admin_Bar {
if ( $node->type == 'group' ) { if ( $node->type == 'group' ) {
if ( empty( $node->meta['class'] ) ) if ( empty( $node->meta['class'] ) )
$node->meta['class'] = ''; $node->meta['class'] = $group_class;
else
$node->meta['class'] .= ' ' . $group_class; $node->meta['class'] .= ' ' . $group_class;
} }
@ -367,9 +368,12 @@ class WP_Admin_Bar {
if ( $node->type != 'group' || empty( $node->children ) ) if ( $node->type != 'group' || empty( $node->children ) )
return; return;
$class = empty( $node->meta['class'] ) ? '' : $node->meta['class']; if ( ! empty( $node->meta['class'] ) )
$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
else
$class = '';
?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php ?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $class; ?>><?php
foreach ( $node->children as $item ) { foreach ( $node->children as $item ) {
$this->_render_item( $item ); $this->_render_item( $item );
} }
@ -389,16 +393,19 @@ class WP_Admin_Bar {
$aria_attributes = 'tabindex="' . $tabindex . '"'; $aria_attributes = 'tabindex="' . $tabindex . '"';
if ( $is_parent ) { if ( $is_parent ) {
$menuclass = 'menupop'; $menuclass = 'menupop ';
$aria_attributes .= ' aria-haspopup="true"'; $aria_attributes .= ' aria-haspopup="true"';
} }
if ( ! empty( $node->meta['class'] ) ) if ( ! empty( $node->meta['class'] ) )
$menuclass .= ' ' . $node->meta['class']; $menuclass .= $node->meta['class'];
if ( $menuclass )
$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
?> ?>
<li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"><?php <li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
if ( $has_link ): if ( $has_link ):
?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php ?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
if ( ! empty( $node->meta['onclick'] ) ) : if ( ! empty( $node->meta['onclick'] ) ) :