diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index 9310108150..f4a574b2f9 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -114,7 +114,8 @@
"allowSwitching": false,
"allowInheriting": false,
"default": {
- "type": "flex"
+ "type": "flex",
+ "setCascadingProperties": true
}
}
},
diff --git a/src/wp-includes/blocks/navigation/view.asset.php b/src/wp-includes/blocks/navigation/view.asset.php
index d28c9db95b..5e1b5bbc91 100644
--- a/src/wp-includes/blocks/navigation/view.asset.php
+++ b/src/wp-includes/blocks/navigation/view.asset.php
@@ -1 +1 @@
- array(), 'version' => '86538493346805d860c94eb70dd1323d');
\ No newline at end of file
+ array(), 'version' => '8591fc81d18e61a0f33b213b1fe35e52');
\ No newline at end of file
diff --git a/src/wp-includes/blocks/navigation/view.min.asset.php b/src/wp-includes/blocks/navigation/view.min.asset.php
index 444bff6867..c34bdccb16 100644
--- a/src/wp-includes/blocks/navigation/view.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view.min.asset.php
@@ -1 +1 @@
- array(), 'version' => '7b2c5174a07c417dc3db6f1d9a9c3f78');
\ No newline at end of file
+ array(), 'version' => '4942262e50480536aae4cd504a13f19c');
\ No newline at end of file
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
index c97acdbd2e..7e5f93f520 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
@@ -234,18 +234,45 @@ class WP_REST_Global_Styles_Controller extends WP_REST_Controller {
public function prepare_item_for_response( $post, $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
$config = json_decode( $post->post_content, true );
$is_global_styles_user_theme_json = isset( $config['isGlobalStylesUserThemeJSON'] ) && true === $config['isGlobalStylesUserThemeJSON'];
- $result = array(
- 'id' => $post->ID,
- 'settings' => ! empty( $config['settings'] ) && $is_global_styles_user_theme_json ? $config['settings'] : new stdClass(),
- 'styles' => ! empty( $config['styles'] ) && $is_global_styles_user_theme_json ? $config['styles'] : new stdClass(),
- 'title' => array(
- 'raw' => $post->post_title,
- 'rendered' => get_the_title( $post ),
- ),
- );
- $result = $this->add_additional_fields_to_object( $result, $request );
- $response = rest_ensure_response( $result );
- $links = $this->prepare_links( $post->id );
+ $fields = $this->get_fields_for_response( $request );
+
+ // Base fields for every post.
+ $data = array();
+
+ if ( rest_is_field_included( 'id', $fields ) ) {
+ $data['id'] = $post->ID;
+ }
+
+ if ( rest_is_field_included( 'title', $fields ) ) {
+ $data['title'] = array();
+ }
+ if ( rest_is_field_included( 'title.raw', $fields ) ) {
+ $data['title']['raw'] = $post->post_title;
+ }
+ if ( rest_is_field_included( 'title.rendered', $fields ) ) {
+ add_filter( 'protected_title_format', array( $this, 'protected_title_format' ) );
+
+ $data['title']['rendered'] = get_the_title( $post->ID );
+
+ remove_filter( 'protected_title_format', array( $this, 'protected_title_format' ) );
+ }
+
+ if ( rest_is_field_included( 'settings', $fields ) ) {
+ $data['settings'] = ! empty( $config['settings'] ) && $is_global_styles_user_theme_json ? $config['settings'] : new stdClass();
+ }
+
+ if ( rest_is_field_included( 'styles', $fields ) ) {
+ $data['styles'] = ! empty( $config['styles'] ) && $is_global_styles_user_theme_json ? $config['styles'] : new stdClass();
+ }
+
+ $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+ $data = $this->add_additional_fields_to_object( $data, $request );
+ $data = $this->filter_response_by_context( $data, $context );
+
+ // Wrap the data in a response object.
+ $response = rest_ensure_response( $data );
+
+ $links = $this->prepare_links( $post->ID );
$response->add_links( $links );
if ( ! empty( $links['self']['href'] ) ) {
$actions = $this->get_available_actions();
@@ -300,6 +327,21 @@ class WP_REST_Global_Styles_Controller extends WP_REST_Controller {
return $rels;
}
+ /**
+ * Overwrites the default protected title format.
+ *
+ * By default, WordPress will show password protected posts with a title of
+ * "Protected: %s", as the REST API communicates the protected status of a post
+ * in a machine readable format, we remove the "Protected: " prefix.
+ *
+ * @since 5.9.0
+ *
+ * @return string Protected title format.
+ */
+ public function protected_title_format() {
+ return '%s';
+ }
+
/**
* Retrieves the query params for the global styles collection.
*