Changeset 17279 for trunk/wp-includes/class-wp-admin-bar.php

Timestamp:

01/13/2011 01:34:15 AM (15 years ago)

Author:

westi

Message:

Add unique ids as well as of classes in the admin bar to make it easier for plugins to extend.
Ensure we escape the classname.
Fixes #16211 props koopersmith.

File:

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

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

@@ -114 +114 @@
     /* Helpers */
     function recursive_render( $id, &$menu_item ) { ?>
-        <?php $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?>
-
-        <li class="<?php echo $menuclass . "ab-$id" ?><?php
-            if ( ! empty( $menu_item['meta']['class'] ) ) :
-                echo ' ' . esc_attr( $menu_item['meta']['class'] );
-            endif;
-        ?>">
+        <?php
+        $is_parent =  ! empty( $menu_item['children'] );
+        
+        $menuclass = $is_parent ? 'menupop' : '';
+        if ( ! empty( $menu_item['meta']['class'] ) )
+            $menuclass .= ' ' . $menu_item['meta']['class'];
+        ?>
+
+        <li id="<?php echo esc_attr( "wp-admin-bar-$id" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>">
             <a href="<?php echo esc_url( $menu_item['href'] ) ?>"<?php
                 if ( ! empty( $menu_item['meta']['onclick'] ) ) :
@@ -134 +136 @@
             ?>><?php
 
-            if ( ! empty( $menuclass ) ) :
+            if ( $is_parent ) :
                 ?><span><?php
             endif;
@@ -140 +142 @@
             echo $menu_item['title'];
 
-            if ( ! empty( $menuclass ) ) :
+            if ( $is_parent ) :
                 ?></span><?php
             endif;
@@ -146 +148 @@
             ?></a>
 
-            <?php if ( ! empty( $menu_item['children'] ) ) : ?>
+            <?php if ( $is_parent ) : ?>
             <ul>
                 <?php foreach ( $menu_item['children'] as $child_id => $child_menu_item ) : ?>