Ticket #32816: 32816-ataylor-js-validation.diff

src/wp-admin/js/customize-nav-menus.js

@@ -545 +545 @@
                         if ( '' === itemName.val() ) {
                                 itemName.addClass( 'invalid' );
                                 return;
-                        } else if ('' === itemUrl.val() ||
-                                'http://' === itemUrl.val() ||
-                                // Copyright (c) 2010-2013 Diego Perini, MIT licensed
-                                // https://gist.github.com/dperini/729294
-                                // see also https://mathiasbynens.be/demo/url-regex
-                                // modified to allow protocol-relative URLs
-                                /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(value)
-                        ) {
-                                itemUrl.addClass('invalid');
+                        } else if ( '' === itemUrl.val() || 'http://' === itemUrl.val() ) {
+                                itemUrl.addClass( 'invalid' );
                                 return;
                         }
 

src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

@@ -722 +722 @@
                 $menu_item_value['attr_title'] = wp_unslash( apply_filters( 'excerpt_save_pre', wp_slash( $menu_item_value['attr_title'] ) ) );
                 $menu_item_value['description'] = wp_unslash( apply_filters( 'content_save_pre', wp_slash( $menu_item_value['description'] ) ) );
 
-                if ( '' !== $menu_item_value['url'] ) {
-                        $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
-                        if ( '' === $menu_item_value['url'] ) {
-                                return new WP_Error( 'invalid_nav_menu_url', __( 'Invalid URL.' ) ); // Fail sanitization if URL is invalid.
-                        }
-                }
+                $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
                 if ( 'publish' !== $menu_item_value['status'] ) {
                         $menu_item_value['status'] = 'draft';
                 }