Changeset 45832 for branches/5.2

Timestamp:

08/19/2019 04:06:15 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Menus: Trim whitespace from custom link URLs.

Props majemedia, SergeyBiryukov.
Merges [45655] and [45656] to the 5.2 branch.
Fixes #47723.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• src/wp-includes/nav-menu.php (modified) (1 diff)
• tests/phpunit/tests/post/nav-menu.php (modified) (2 diffs)

branches/5.2/src/wp-includes/nav-menu.php

@@ -457 +457 @@
         $original_parent = 0 < $menu_item_db_id ? get_post_field( 'post_parent', $menu_item_db_id ) : 0;
 
-        if ( 'custom' != $args['menu-item-type'] ) {
-                /* if non-custom menu item, then:
-                        * use original object's URL
-                        * blank default title to sync with original object's
-                */
+        if ( 'custom' === $args['menu-item-type'] ) {
+                // If custom menu item, trim the URL.
+                $args['menu-item-url'] = trim( $args['menu-item-url'] );
+        } else {
+                /*
+                 * If non-custom menu item, then:
+                 * - use the original object's URL.
+                 * - blank default title to sync with the original object's title.
+                 */
 
                 $args['menu-item-url'] = '';

branches/5.2/tests/phpunit/tests/post/nav-menu.php

@@ -150 +150 @@
                                 'menu-item-type'   => 'custom',
                                 'menu-item-title'  => 'Wordpress.org',
-                                'menu-item-link'   => 'http://wordpress.org',
+                                'menu-item-url'    => 'http://wordpress.org',
                                 'menu-item-status' => 'publish',
                         )
@@ -927 +927 @@
         }
 
+        /**
+         * @ticket 47723
+         * @dataProvider data_trim_url_for_custom_item
+         */
+        function test_trim_url_for_custom_item( $custom_url, $correct_url ) {
+                $custom_item_id = wp_update_nav_menu_item(
+                        $this->menu_id,
+                        0,
+                        array(
+                                'menu-item-type'   => 'custom',
+                                'menu-item-title'  => 'WordPress.org',
+                                'menu-item-url'    => $custom_url,
+                                'menu-item-status' => 'publish',
+                        )
+                );
+
+                $custom_item = wp_setup_nav_menu_item( get_post( $custom_item_id ) );
+                $this->assertEquals( $correct_url, $custom_item->url );
+        }
+
+        /**
+         * Provides data for test_trim_url_for_custom_item().
+         */
+        function data_trim_url_for_custom_item() {
+                return array(
+                        array( 'https://wordpress.org ', 'https://wordpress.org' ),
+                        array( ' https://wordpress.org', 'https://wordpress.org' ),
+                );
+        }
+
 }