Changeset 41697 for trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

Timestamp:

10/03/2017 03:43:01 AM (7 years ago)

Author:

westonruter

Message:

Customize: Provide validation feedback for invalid Custom Link URLs in nav menu items.

Props RMarks, EGregor, umangvaghela123, andrew.taylor, celloexpressions, westonruter, voldemortensen.
Fixes #32816.

File:

• trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php (modified) (2 diffs)

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

@@ -642 +642 @@
      *
      * @param array $menu_item_value The value to sanitize.
-     * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
-     *                          Otherwise the sanitized value.
+     * @return array|false|null|WP_Error Null or WP_Error if an input isn't valid. False if it is marked for deletion.
+     *                                   Otherwise the sanitized value.
      */
     public function sanitize( $menu_item_value ) {
@@ -702 +702 @@
         $menu_item_value['description'] = wp_unslash( apply_filters( 'content_save_pre', wp_slash( $menu_item_value['description'] ) ) );
 
-        $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
+        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_url', __( 'Invalid URL.' ) ); // Fail sanitization if URL is invalid.
+            }
+        }
         if ( 'publish' !== $menu_item_value['status'] ) {
             $menu_item_value['status'] = 'draft';