Ticket #32495: 32495.5.patch

wp-includes/admin-bar.php

@@ -833 +833 @@
                 'parent' => 'top-secondary',
                 'id'     => 'search',
                 'title'  => $form,
+                'wrapper' => 'div',
                 'meta'   => array(
                         'class'    => 'admin-bar-search',
                         'tabindex' => -1,

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

@@ -124 +124 @@
                 }
 
                 $defaults = array(
-                        'id'     => false,
-                        'title'  => false,
-                        'parent' => false,
-                        'href'   => false,
-                        'group'  => false,
-                        'meta'   => array(),
+                        'id'      => false,
+                        'title'   => false,
+                        'parent'  => false,
+                        'href'    => false,
+                        'group'   => false,
+                        'wrapper' => 'a',
+                        'meta'    => array(),
                 );
 
                 // If the node already exists, keep any data that isn't provided.
@@ -503 +504 @@
                                 endif;
                                 ?>><?php
                         else:
-                                ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
-                                if ( ! empty( $node->meta['title'] ) ) :
-                                        ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+                                if ( $node->wrapper != 'a' ):
+                                        ?><<?php echo esc_html( $node->wrapper ); ?> class="ab-item ab-empty-item" <?php echo $aria_attributes;
+                                        if ( ! empty( $node->meta['title'] ) ) :
+                                                ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+                                        endif;
+                                        ?>><?php
+                                else:
+                                        ?><a href="#wp-admin-bar-<?php esc_attr( $node->id ); ?>" class="ab-item ab-empty-item" <?php echo $aria_attributes;
+                                        if ( ! empty( $node->meta['title'] ) ) :
+                                                ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+                                        endif;
+                                        ?>><?php
                                 endif;
-                                ?>><?php
                         endif;
 
                         echo $node->title;
 
-                        if ( $has_link ) :
+                        if ( $node->wrapper != 'a' ) :
+                                ?></<?php echo esc_html( $node->wrapper ); ?>><?php
+                        else:
                                 ?></a><?php
-                        else:
-                                ?></div><?php
                         endif;
 
                         if ( $is_parent ) :