From 3394082032520c0c3ba7c8c9de506ab49c9fd927 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Tue, 20 Feb 2024 09:10:09 +0000
Subject: [PATCH] REST API: Pass correct context to embedded items.

Fixes a regression introduced in [57623] where navigation embed items were missing `raw` property values.

Props mamaduka, swissspidy, youknowriad, timothyblynjacobs.
Fixes #43439.
Built from https://develop.svn.wordpress.org/trunk@57659


git-svn-id: http://core.svn.wordpress.org/trunk@57160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/rest-api/class-wp-rest-server.php | 10 +++++-----
 wp-includes/version.php                       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php
index 380eea2ca3..b85c020b0f 100644
--- a/wp-includes/rest-api/class-wp-rest-server.php
+++ b/wp-includes/rest-api/class-wp-rest-server.php
@@ -743,6 +743,11 @@ class WP_REST_Server {
 						continue;
 					}
 
+					// Embedded resources get passed context=embed.
+					if ( empty( $request['context'] ) ) {
+						$request['context'] = 'embed';
+					}
+
 					if ( empty( $request['per_page'] ) ) {
 						$matched = $this->match_request_to_handler( $request );
 						if ( ! is_wp_error( $matched ) && isset( $matched[1]['args']['per_page']['maximum'] ) ) {
@@ -750,11 +755,6 @@ class WP_REST_Server {
 						}
 					}
 
-					// Embedded resources get passed context=embed.
-					if ( empty( $request['context'] ) ) {
-						$request['context'] = 'embed';
-					}
-
 					$response = $this->dispatch( $request );
 
 					/** This filter is documented in wp-includes/rest-api/class-wp-rest-server.php */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3e6b5c0542..f4af152088 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-beta1-57658';
+$wp_version = '6.5-beta1-57659';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.