enmi-conf.org: comparison wp/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 * @see WP_REST_Posts_Controller
 */
 class WP_REST_Menu_Items_Controller extends WP_REST_Posts_Controller {
 	/**
-	 * Get the nav menu item, if the ID is valid.
+	 * Gets the nav menu item, if the ID is valid.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @param int $id Supplied ID.
 	 * @return object|WP_Error Post object if ID is valid, WP_Error otherwise.
 	 * Checks if a given request has access to read a menu item if they have access to edit them.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object otherwise.
+	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object or false otherwise.
 	 */
 	public function get_item_permissions_check( $request ) {
 		$permission_check = parent::get_item_permissions_check( $request );
 		if ( true !== $permission_check ) {
 	 * This allows for any user that can `edit_theme_options` or edit any REST API available post type.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error Whether the current user has permission.
+	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
 	protected function check_has_read_only_access( $request ) {
 		if ( current_user_can( 'edit_theme_options' ) ) {
 			return true;
 		}
 	 * Creates a single post.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 *
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function create_item( $request ) {
 		if ( ! empty( $request['id'] ) ) {
 			return new WP_Error( 'rest_post_exists', __( 'Cannot create existing post.' ), array( 'status' => 400 ) );
 	 * Updates a single nav menu item.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 *
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function update_item( $request ) {
 		$valid_check = $this->get_nav_menu_item( $request['id'] );
 		if ( is_wp_error( $valid_check ) ) {
 	/**
 	 * Prepares a single post output for response.
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param WP_Post          $item   Post object.
+	 * @param WP_Post         $item    Post object.
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
 	public function prepare_item_for_response( $item, $request ) {
 		// Base fields for every post.
 		$data    = $this->filter_response_by_context( $data, $context );
 		// Wrap the data in a response object.
 		$response = rest_ensure_response( $data );
-		$links = $this->prepare_links( $item );
+		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
-		$response->add_links( $links );
+			$links = $this->prepare_links( $item );
+			$response->add_links( $links );
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $item, $request );
+			if ( ! empty( $links['self']['href'] ) ) {
+				$actions = $this->get_available_actions( $item, $request );
-			$self = $links['self']['href'];
+				$self = $links['self']['href'];
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
+				foreach ( $actions as $rel ) {
+					$response->add_link( $rel, $self );
+				}
 			}
 		}
 		/**
 		 * Filters the menu item data for a REST API response.
 		return $links;
 	}
 	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the posts collection.
+	 * Retrieves Link Description Objects that should be added to the Schema for the posts collection.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @return array
 	 */
 	 * @since 5.9.0
 	 *
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
 		$schema = array(
 			'$schema' => 'http://json-schema.org/draft-04/schema#',
 			'title'   => $this->post_type,
 			'type'    => 'object',
 		);
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'readonly'    => true,
 		);
 		$schema['properties']['type_label'] = array(
-			'description' => __( 'Name of type.' ),
+			'description' => __( 'The singular label used to describe this type of menu item.' ),
 			'type'        => 'string',
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'readonly'    => true,
 		);
 			'items'       => array(
 				'type' => 'string',
 			),
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'arg_options' => array(
-				'sanitize_callback' => function ( $value ) {
+				'sanitize_callback' => static function ( $value ) {
 					return array_map( 'sanitize_html_class', wp_parse_list( $value ) );
 				},
 			),
 		);
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'enum'        => array(
 				'_blank',
 				'',
 			),
-		);
-		$schema['properties']['type_label'] = array(
-			'description' => __( 'The singular label used to describe this type of menu item.' ),
-			'context'     => array( 'view', 'edit', 'embed' ),
-			'type'        => 'string',
-			'readonly'    => true,
 		);
 		$schema['properties']['url'] = array(
 			'description' => __( 'The URL to which this menu item points.' ),
 			'type'        => 'string',
 				'validate_callback' => static function ( $url ) {
 					if ( '' === $url ) {
 						return true;
 					}
-					if ( esc_url_raw( $url ) ) {
+					if ( sanitize_url( $url ) ) {
 						return true;
 					}
 					return new WP_Error(
 						'rest_invalid_url',
 			'items'       => array(
 				'type' => 'string',
 			),
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'arg_options' => array(
-				'sanitize_callback' => function ( $value ) {
+				'sanitize_callback' => static function ( $value ) {
 					return array_map( 'sanitize_html_class', wp_parse_list( $value ) );
 				},
 			),
 		);
 		if ( $schema_links ) {
 			$schema['links'] = $schema_links;
 		}
-		return $this->add_additional_fields_schema( $schema );
+		$this->schema = $schema;
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 	/**
 	 * Retrieves the query params for the posts collection.
 	 *
 			if ( isset( $orderby_mappings[ $request['orderby'] ] ) ) {
 				$query_args['orderby'] = $orderby_mappings[ $request['orderby'] ];
 			}
 		}
+		$query_args['update_menu_item_cache'] = true;
 		return $query_args;
 	}
 	/**
 	 * Gets the id of the menu that the given menu item belongs to.

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef