From bd5882e27bfeb64027779dfb18788760b9534309 Mon Sep 17 00:00:00 2001
From: youknowriad <youknowriad@git.wordpress.org>
Date: Tue, 28 May 2024 08:02:16 +0000
Subject: [PATCH] Toolbar: Update the site editor link in the Admin Bar.

The details page is being removed from the site editor in 6.6. we need to direct the admin bar menu item to the "edit" mode page directly.

Props youknowriad, mamaduka.
Fixes #61266.
Built from https://develop.svn.wordpress.org/trunk@58223


git-svn-id: http://core.svn.wordpress.org/trunk@57686 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/admin-bar.php | 2 ++
 wp-includes/version.php   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 3e1740f614..8eb1e24e93 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -455,6 +455,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
  *
  * @since 5.9.0
  * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
+ * @since 6.6.0 Added the `canvas` query arg to the Site Editor link.
  *
  * @global string $_wp_current_template_id
  *
@@ -481,6 +482,7 @@ function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
 				array(
 					'postType' => 'wp_template',
 					'postId'   => $_wp_current_template_id,
+					'canvas'   => 'edit',
 				),
 				admin_url( 'site-editor.php' )
 			),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 48d0ebd6c6..1b662b4e15 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-alpha-58222';
+$wp_version = '6.6-alpha-58223';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.