Changeset 52079 for trunk/src/wp-includes/nav-menu.php

Timestamp:

11/09/2021 06:58:59 PM (5 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Introduce Menu management endpoints.

This commit introduces the /wp/v2/menus, /wp/v2/menu-items and /wp/v2/menu-locations REST API endpoints. These endpoints are fully available to users with the edit_theme_options capability, but can be read by any user who can edit a REST API available post type.

The nav_menu taxonomy and nav_menu_item post type now map their capabilities to the edit_theme_options primitive capability. This allows developers to provide more fine-grained access control. However, if a developer is currently dynamically removing the edit_theme_options capability using map_meta_cap, they should use the user_has_cap filter instead.

The wp_update_nav_menu_item() function has been adjusted to return an error if saving the menu item post or assigning the menu item to a menu generate an error.

Lastly, a new menu item type is introduced, block, that can be used to store a Block as a menu item.

Props andraganescu, antonvlasenko, dingo_d, dlh, isabel_brison, kadamwhite, Mamaduka, NateWr, noisysocks, peterwilsoncc, ryelle, schlessera, soean, Spacedmonkey, talldanwp, TimothyBlynJacobs, tobifjellner, westonruter, wpscholar, zieladam.
Fixes #40878.

File:

• trunk/src/wp-includes/nav-menu.php (modified) (7 diffs)

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

@@ -407 +407 @@
  * Save the properties of a menu item or create a new one.
  *
- * The menu-item-title, menu-item-description, and menu-item-attr-title are expected
- * to be pre-slashed since they are passed directly into `wp_insert_post()`.
- *
- * @since 3.0.0
+ * The menu-item-title, menu-item-description, menu-item-attr-title, and menu-item-content are expected
+ * to be pre-slashed since they are passed directly to APIs that expect slashed data.
+ *
+ * @since 3.0.0
+ * @since 5.9.0 Added the menu-item-content parameter.
  *
  * @param int   $menu_id         The ID of the menu. Required. If "0", makes the menu item a draft orphan.
@@ -449 +450 @@
                 'menu-item-target'        => '',
                 'menu-item-classes'       => '',
+                'menu-item-content'       => '',
                 'menu-item-xfn'           => '',
                 'menu-item-status'        => '',
@@ -527 +529 @@
                 $post['ID']          = 0;
                 $post['post_status'] = 'publish' === $args['menu-item-status'] ? 'publish' : 'draft';
-                $menu_item_db_id     = wp_insert_post( $post );
+                $menu_item_db_id     = wp_insert_post( $post, true );
                 if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) ) {
                         return $menu_item_db_id;
@@ -549 +551 @@
         // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms().
         if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
-                wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
+                $update_terms = wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
+                if ( is_wp_error( $update_terms ) ) {
+                        return $update_terms;
+                }
         }
 
@@ -570 +575 @@
         update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
         update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw( $args['menu-item-url'] ) );
+        update_post_meta( $menu_item_db_id, '_menu_item_content', $args['menu-item-content'] );
 
         if ( 0 == $menu_id ) {
@@ -581 +587 @@
                 $post['ID']          = $menu_item_db_id;
                 $post['post_status'] = ( 'draft' === $args['menu-item-status'] ) ? 'draft' : 'publish';
-                wp_update_post( $post );
+
+                $update_post = wp_update_post( $post, true );
+                if ( is_wp_error( $update_post ) ) {
+                        return $update_post;
+                }
         }
 
@@ -904 +914 @@
                                 $menu_item->title = ( '' === $menu_item->post_title ) ? $original_title : $menu_item->post_title;
 
+                        } elseif ( 'block' === $menu_item->type ) {
+                                $menu_item->type_label        = __( 'Block' );
+                                $menu_item->title             = $menu_item->post_title;
+                                $menu_item->menu_item_content = ! isset( $menu_item->menu_item_content ) ? get_post_meta( $menu_item->ID, '_menu_item_content', true ) : $menu_item->menu_item_content;
                         } else {
                                 $menu_item->type_label = __( 'Custom Link' );