Ticket #38636: 38636.2.patch

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

@@ -108 +108 @@
          *
          * @since 3.1.0
          * @since 4.5.0 Added the ability to pass 'lang' and 'dir' meta data.
+         * @since x.x.x Added the ability to pass most HTML attributes as meta data.
+         * @since x.x.x Added `aria-current` attribute.
          *
+         * @global string $pagenow
+         *
          * @param array $args {
          *     Arguments for adding a node.
          *
@@ -117 +121 @@
          *     @type string $parent Optional. ID of the parent node.
          *     @type string $href   Optional. Link for the item.
          *     @type bool   $group  Optional. Whether or not the node is a group. Default false.
-         *     @type array  $meta   Meta data including the following keys: 'html', 'class', 'rel', 'lang', 'dir',
-         *                          'onclick', 'target', 'title', 'tabindex'. Default empty.
+         *     @type array  $meta   Optional. Meta data for the node.
+         *                          Add HTML attributes to the item, such as
+         *                          'rel', 'lang', 'dir', 'onclick', 'target', 'title', 'tabindex'.
+         *                          Reserved attributes include 'href', 'aria-haspopup', 'aria-current'.
+         *                          Use 'html' to append arbitrary HTML content within the node.
+         *                          Use 'class' to apply classes to the node element.
+         *                          Default empty.
          * }
          */
         public function add_node( $args ) {
@@ -537 +546 @@
                 echo "<li id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";
 
                 if ( $has_link ) {
-                        $attributes = array( 'onclick', 'target', 'title', 'rel', 'lang', 'dir' );
+                        if ( is_admin() ) {
+                                global $pagenow;
+                                if ( $node->href == network_admin_url( $pagenow ) ) {
+                                        $aria_attributes .= ' aria-current="page"';
+                                }
+                        }
                         echo "<a class='ab-item'$aria_attributes href='" . esc_url( $node->href ) . "'";
                 } else {
-                        $attributes = array( 'onclick', 'target', 'title', 'rel', 'lang', 'dir' );
                         echo '<div class="ab-item ab-empty-item"' . $aria_attributes;
                 }
 
-                foreach ( $attributes as $attribute ) {
-                        if ( empty( $node->meta[ $attribute ] ) ) {
+                $reserved = array( 'html', 'class', 'href', 'tabindex', 'aria-haspopup', 'aria-current' );
+
+                foreach ( $node->meta as $attr => $value ) {
+                        if ( in_array( $attr, $reserved ) || empty( $value ) ) {
                                 continue;
                         }
 
-                        if ( 'onclick' === $attribute ) {
-                                echo " $attribute='" . esc_js( $node->meta[ $attribute ] ) . "'";
-                        } else {
-                                echo " $attribute='" . esc_attr( $node->meta[ $attribute ] ) . "'";
-                        }
+                        printf(
+                                ' %s="%s"',
+                                $attr,
+                                0 === stripos( $attr, 'on' ) ? esc_js( $value ) : esc_attr( $value )
+                        );
                 }
 
                 echo ">{$arrow}{$node->title}";