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

Timestamp:

11/09/2015 12:47:55 AM (9 years ago)

Author:

westonruter

Message:

Customize: Improve alignment of WP_Customize_Nav_Menu_Item_Setting::sanitize() behavior with wp_update_nav_menu_item().

• Apply title_save_pre, excerpt_save_pre, and content_save_pre filters on a nav menu item's title, attr_title, and description properties respectively. This ensures that arbitrary markup can be supplied if the user has unfiltered_html cap, and for these fields to have markup stripped if not.
• Ensure a nav menu item's post_status is sanitized as publish or draft using the same conditions as wp_update_nav_menu_item().
• Align WP_Customize_Nav_Menu_Item_Setting::sanitize() behavior for sanitizing position to be the same as wp_update_nav_menu_item().
• Also apply nav_menu_attr_title and nav_menu_description filters in WP_Customize_Nav_Menu_Item_Setting::value_as_wp_post_nav_menu_item() to ensure that previewing markup entered into menu item description will preview the same way as when the nav menu item is saved.
• Add unit tests.

Fixes #32812.

File:

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

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

@@ -573 +573 @@
         }
 
+        /** This filter is documented in wp-includes/nav-menu.php */
+        $post->attr_title = apply_filters( 'nav_menu_attr_title', $post->attr_title );
+
+        /** This filter is documented in wp-includes/nav-menu.php */
+        $post->description = apply_filters( 'nav_menu_description', wp_trim_words( $post->description, 200 ) );
+
         return $post;
     }
@@ -620 +626 @@
         $menu_item_value = array_merge( $default, $menu_item_value );
         $menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
-        $menu_item_value['position'] = max( 0, intval( $menu_item_value['position'] ) );
+        $menu_item_value['position'] = intval( $menu_item_value['position'] );
 
         foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
@@ -639 +645 @@
         }
 
-        foreach ( array( 'title', 'attr_title', 'description', 'original_title' ) as $key ) {
-            // @todo Should esc_attr() the attr_title as well?
-            $menu_item_value[ $key ] = sanitize_text_field( $menu_item_value[ $key ] );
-        }
+        $menu_item_value['original_title'] = sanitize_text_field( $menu_item_value['original_title'] );
+
+        // Apply the same filters as when calling wp_insert_post().
+        $menu_item_value['title'] = apply_filters( 'title_save_pre', $menu_item_value['title'] );
+        $menu_item_value['attr_title'] = apply_filters( 'excerpt_save_pre', $menu_item_value['attr_title'] );
+        $menu_item_value['description'] = apply_filters( 'content_save_pre', $menu_item_value['description'] );
 
         $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
-        if ( ! get_post_status_object( $menu_item_value['status'] ) ) {
-            $menu_item_value['status'] = 'publish';
+        if ( 'publish' !== $menu_item_value['status'] ) {
+            $menu_item_value['status'] = 'draft';
         }