Changeset 52184 for trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php

Timestamp:

11/16/2021 05:07:43 PM (3 years ago)

Author:

spacedmonkey

Message:

REST API: Remove experimental block menu item types.

The menu items REST API controller was added in [52079]. This included functionality to add a "block" menu item type. This functionality is experimental and not currently used in WordPress core, so should be removed.

Props noisysocks.
See #40878.

File:

• trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php (modified) (7 diffs)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php

@@ -340 +340 @@
                 'menu-item-url'         => $menu_item_obj->url,
                 'menu-item-description' => $menu_item_obj->description,
-                'menu-item-content'     => $menu_item_obj->menu_item_content,
                 'menu-item-attr-title'  => $menu_item_obj->attr_title,
                 'menu-item-target'      => $menu_item_obj->target,
@@ -361 +360 @@
                 'menu-item-url'         => '',
                 'menu-item-description' => '',
-                'menu-item-content'     => '',
                 'menu-item-attr-title'  => '',
                 'menu-item-target'      => '',
@@ -407 +405 @@
             } elseif ( ! empty( $request['title']['raw'] ) ) {
                 $prepared_nav_item['menu-item-title'] = $request['title']['raw'];
-            }
-        }
-
-        // Nav menu content.
-        if ( ! empty( $schema['properties']['content'] ) && isset( $request['content'] ) ) {
-            if ( is_string( $request['content'] ) ) {
-                $prepared_nav_item['menu-item-content'] = $request['content'];
-            } elseif ( isset( $request['content']['raw'] ) ) {
-                $prepared_nav_item['menu-item-content'] = $request['content']['raw'];
             }
         }
@@ -461 +450 @@
         }
 
-        // If menu item is type block, then content is required.
-        if ( 'block' === $prepared_nav_item['menu-item-type'] && empty( $prepared_nav_item['menu-item-content'] ) ) {
-            $error->add( 'rest_content_required', __( 'The content is required when using a block menu item type.' ), array( 'status' => 400 ) );
-        }
-
         if ( $error->has_errors() ) {
             return $error;
@@ -565 +549 @@
             // It is stored as a string, but should be exposed as an integer.
             $data['object_id'] = absint( $menu_item->object_id );
-        }
-
-        if ( rest_is_field_included( 'content', $fields ) ) {
-            $data['content'] = array();
-        }
-
-        if ( rest_is_field_included( 'content.raw', $fields ) ) {
-            $data['content']['raw'] = $menu_item->menu_item_content;
-        }
-
-        if ( rest_is_field_included( 'content.rendered', $fields ) ) {
-            /** This filter is documented in wp-includes/post-template.php */
-            $data['content']['rendered'] = apply_filters( 'the_content', $menu_item->menu_item_content );
-        }
-
-        if ( rest_is_field_included( 'content.block_version', $fields ) ) {
-            $data['content']['block_version'] = block_version( $menu_item->menu_item_content );
         }
 
@@ -782 +749 @@
             'description' => __( 'The family of objects originally represented, such as "post_type" or "taxonomy".' ),
             'type'        => 'string',
-            'enum'        => array( 'taxonomy', 'post_type', 'post_type_archive', 'custom', 'block' ),
+            'enum'        => array( 'taxonomy', 'post_type', 'post_type_archive', 'custom' ),
             'context'     => array( 'view', 'edit', 'embed' ),
             'default'     => 'custom',
@@ -858 +825 @@
             'minimum'     => 0,
             'default'     => 0,
-        );
-
-        $schema['properties']['content'] = array(
-            'description' => __( 'HTML content to display for this block menu item.' ),
-            'context'     => array( 'view', 'edit', 'embed' ),
-            'type'        => array( 'string', 'object' ),
-            'properties'  => array(
-                'raw'           => array(
-                    'description' => __( 'HTML content, as it exists in the database.' ),
-                    'type'        => 'string',
-                    'context'     => array( 'edit' ),
-                ),
-                'rendered'      => array(
-                    'description' => __( 'HTML content, transformed for display.' ),
-                    'type'        => 'string',
-                    'context'     => array( 'view', 'edit' ),
-                    'readonly'    => true,
-                ),
-                'block_version' => array(
-                    'description' => __( 'Version of the block format used in the HTML content.' ),
-                    'type'        => 'integer',
-                    'context'     => array( 'edit' ),
-                    'readonly'    => true,
-                ),
-            ),
         );