Changeset 21193

Timestamp:

06/30/2012 11:47:21 AM (12 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (3 diffs)

trunk/wp-includes/class-wp-admin-bar.php

@@ -238 +238 @@
             if ( $node->type == 'group' ) {
                 if ( empty( $node->meta['class'] ) )
-                    $node->meta['class'] = '';
-                $node->meta['class'] .= ' ' . $group_class;
+                    $node->meta['class'] = $group_class;
+                else
+                    $node->meta['class'] .= ' ' . $group_class;
             }
 
@@ -368 +369 @@
             return;
 
-        $class = empty( $node->meta['class'] ) ? '' : $node->meta['class'];
-
-        ?><ul id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php
+        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 ); ?>"<?php echo $class; ?>><?php
             foreach ( $node->children as $item ) {
                 $this->_render_item( $item );
@@ -390 +394 @@
 
         if ( $is_parent ) {
-            $menuclass = 'menupop';
+            $menuclass = 'menupop ';
             $aria_attributes .= ' aria-haspopup="true"';
         }
 
         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 ):
                 ?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php