Changeset 46413

Timestamp:

10/06/2019 03:04:18 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Menus: In Walker_Nav_Menu, Walker_Category, and Walker_Page, properly output link attributes having a legitimate "empty" value, for example an HTML data attribute with a value of zero (0).

Props nevma, AkSDvP, greenshady, SergeyBiryukov.
Fixes #47720.

Location:

trunk

Files:

• src/wp-includes/class-walker-category.php (modified) (1 diff)
• src/wp-includes/class-walker-nav-menu.php (modified) (1 diff)
• src/wp-includes/class-walker-page.php (modified) (1 diff)
• tests/phpunit/tests/category/walkerCategory.php (added)
• tests/phpunit/tests/menu/walker-nav-menu-edit.php (modified) (1 diff)
• tests/phpunit/tests/menu/walker-nav-menu.php (modified) (4 diffs)
• tests/phpunit/tests/post/walkerPage.php (added)

trunk/src/wp-includes/class-walker-category.php

@@ -140 +140 @@
                 $attributes = '';
                 foreach ( $atts as $attr => $value ) {
-                        if ( ! empty( $value ) ) {
+                        if ( is_scalar( $value ) && '' !== $value && false !== $value ) {
                                 $value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
                                 $attributes .= ' ' . $attr . '="' . $value . '"';

trunk/src/wp-includes/class-walker-nav-menu.php

@@ -204 +204 @@
                 $attributes = '';
                 foreach ( $atts as $attr => $value ) {
-                        if ( ! empty( $value ) ) {
+                        if ( is_scalar( $value ) && '' !== $value && false !== $value ) {
                                 $value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
                                 $attributes .= ' ' . $attr . '="' . $value . '"';

trunk/src/wp-includes/class-walker-page.php

@@ -183 +183 @@
                 $attributes = '';
                 foreach ( $atts as $attr => $value ) {
-                        if ( ! empty( $value ) ) {
+                        if ( is_scalar( $value ) && '' !== $value && false !== $value ) {
                                 $value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
                                 $attributes .= ' ' . $attr . '="' . $value . '"';

trunk/tests/phpunit/tests/menu/walker-nav-menu-edit.php

@@ -5 +5 @@
  * @group walker
  */
-class Tests_Walker_Nav_Menu_Edit extends WP_UnitTestCase {
+class Tests_Menu_Walker_Nav_Menu_Edit extends WP_UnitTestCase {
         protected $_wp_nav_menu_max_depth;
 

trunk/tests/phpunit/tests/menu/walker-nav-menu.php

@@ -4 +4 @@
  * @group walker
  */
-class Tests_Walker_Nav_Menu extends WP_UnitTestCase {
+class Tests_Menu_Walker_Nav_Menu extends WP_UnitTestCase {
 
         /**
@@ -19 +19 @@
                 parent::setUp();
 
-                /** Walker_Nav_Menu_Edit class */
+                /** Walker_Nav_Menu class */
                 require_once ABSPATH . 'wp-includes/class-walker-nav-menu.php';
                 $this->walker = new Walker_Nav_Menu();
@@ -38 +38 @@
 
         /**
-         * Tests when an items target it _blank, that rel="'noopener noreferrer" is added.
+         * Tests when an item's target is _blank, that rel="noopener noreferrer" is added.
          *
-         * @ticket #43290
+         * @ticket 43290
          */
         public function test_noopener_no_referrer_for_target_blank() {
@@ -67 +67 @@
                 $this->assertSame( "<li id=\"menu-item-{$post_id}\" class=\"menu-item-{$post_id}\"><a target=\"_blank\" rel=\"noopener noreferrer\">{$post_title}</a>", $expected );
         }
+
+        /**
+         * @ticket 47720
+         *
+         * @dataProvider data_start_el_with_empty_attributes
+         */
+        public function test_start_el_with_empty_attributes( $value, $expected ) {
+                $output     = '';
+                $post_id    = $this->factory->post->create();
+                $post_title = get_the_title( $post_id );
+
+                $item = array(
+                        'ID'        => $post_id,
+                        'object_id' => $post_id,
+                        'title'     => $post_title,
+                        'target'    => '',
+                        'xfn'       => '',
+                        'current'   => false,
+                );
+
+                $args = array(
+                        'before'      => '',
+                        'after'       => '',
+                        'link_before' => '',
+                        'link_after'  => '',
+                );
+
+                add_filter(
+                        'nav_menu_link_attributes',
+                        function( $atts ) use ( $value ) {
+                                $atts['data-test'] = $value;
+                                return $atts;
+                        }
+                );
+
+                $this->walker->start_el( $output, (object) $item, 0, (object) $args );
+
+                if ( '' !== $expected ) {
+                        $expected = sprintf( ' data-test="%s"', $expected );
+                }
+
+                $this->assertSame( "<li id=\"menu-item-{$post_id}\" class=\"menu-item-{$post_id}\"><a{$expected}>{$post_title}</a>", $output );
+        }
+
+        public function data_start_el_with_empty_attributes() {
+                return array(
+                        array(
+                                '',
+                                '',
+                        ),
+                        array(
+                                0,
+                                '0',
+                        ),
+                        array(
+                                0.0,
+                                '0',
+                        ),
+                        array(
+                                '0',
+                                '0',
+                        ),
+                        array(
+                                null,
+                                '',
+                        ),
+                        array(
+                                false,
+                                '',
+                        ),
+                        array(
+                                true,
+                                '1',
+                        ),
+                        array(
+                                array(),
+                                '',
+                        ),
+                );
+        }
 }