From 4800258d97a1eb841102b3f1a7aba40fed7322bb Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 22 May 2024 09:38:22 +0100
Subject: [PATCH 1/4] Fix the site editor Admin Bar menu item

---
 lib/compat/wordpress-6.6/admin-bar.php | 49 ++++++++++++++++++++++++++
 lib/load.php                           |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 lib/compat/wordpress-6.6/admin-bar.php

diff --git a/lib/compat/wordpress-6.6/admin-bar.php b/lib/compat/wordpress-6.6/admin-bar.php
new file mode 100644
index 0000000000000..52fdfa851929b
--- /dev/null
+++ b/lib/compat/wordpress-6.6/admin-bar.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Changes to the WordPress admin bar.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Adds the "Site Editor" link to the Toolbar.
+ *
+ * @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 argument to the url.
+ *
+ * @global string $_wp_current_template_id
+ *
+ * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
+ */
+function gutenberg_admin_bar_edit_site_menu( $wp_admin_bar ) {
+	global $_wp_current_template_id;
+
+	// Don't show if a block theme is not activated.
+	if ( ! wp_is_block_theme() ) {
+		return;
+	}
+
+	// Don't show for users who can't edit theme options or when in the admin.
+	if ( ! current_user_can( 'edit_theme_options' ) || is_admin() ) {
+		return;
+	}
+
+	$wp_admin_bar->remove_node( 'site-editor' );
+	$wp_admin_bar->add_node(
+		array(
+			'id'    => 'site-editor',
+			'title' => __( 'Site Editor' ),
+			'href'  => add_query_arg(
+				array(
+					'postType' => 'wp_template',
+					'postId'   => $_wp_current_template_id,
+					'canvas'   => 'edit',
+				),
+				admin_url( 'site-editor.php' )
+			),
+		)
+	);
+}
+
+add_action( 'admin_bar_menu', 'gutenberg_admin_bar_edit_site_menu', 41 );
\ No newline at end of file
diff --git a/lib/load.php b/lib/load.php
index b00c024778b5f..357935b413779 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -130,6 +130,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.5/script-loader.php';
 
 // WordPress 6.6 compat.
+require __DIR__ . '/compat/wordpress-6.6/admin-bar.php';
 require __DIR__ . '/compat/wordpress-6.6/compat.php';
 require __DIR__ . '/compat/wordpress-6.6/resolve-patterns.php';
 require __DIR__ . '/compat/wordpress-6.6/block-bindings/pattern-overrides.php';

From 1bb91335bbbcd4616b5654d13db816ba21a739c3 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Wed, 22 May 2024 12:46:57 +0400
Subject: [PATCH 2/4] Remove core action

---
 lib/compat/wordpress-6.6/admin-bar.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/compat/wordpress-6.6/admin-bar.php b/lib/compat/wordpress-6.6/admin-bar.php
index 52fdfa851929b..8892559cd7f62 100644
--- a/lib/compat/wordpress-6.6/admin-bar.php
+++ b/lib/compat/wordpress-6.6/admin-bar.php
@@ -29,7 +29,6 @@ function gutenberg_admin_bar_edit_site_menu( $wp_admin_bar ) {
 		return;
 	}
 
-	$wp_admin_bar->remove_node( 'site-editor' );
 	$wp_admin_bar->add_node(
 		array(
 			'id'    => 'site-editor',
@@ -45,5 +44,5 @@ function gutenberg_admin_bar_edit_site_menu( $wp_admin_bar ) {
 		)
 	);
 }
-
-add_action( 'admin_bar_menu', 'gutenberg_admin_bar_edit_site_menu', 41 );
\ No newline at end of file
+remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_site_menu', 40 );
+add_action( 'admin_bar_menu', 'gutenberg_admin_bar_edit_site_menu', 41 );

From 3e84347394eaebb8430fb85125476656c86dfb79 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 22 May 2024 09:55:27 +0100
Subject: [PATCH 3/4] Add backport file

---
 backport-changelog/6.6/61266.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 backport-changelog/6.6/61266.md

diff --git a/backport-changelog/6.6/61266.md b/backport-changelog/6.6/61266.md
new file mode 100644
index 0000000000000..4ffdbaccc1332
--- /dev/null
+++ b/backport-changelog/6.6/61266.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/6605
+
+* https://github.com/WordPress/gutenberg/pull/61851
\ No newline at end of file

From 35ff8de6baa09afff8f15fac1858bb60449b6cd4 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Wed, 22 May 2024 13:27:02 +0200
Subject: [PATCH 4/4] Rename 61266.md to 6605.md

---
 backport-changelog/6.6/{61266.md => 6605.md} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename backport-changelog/6.6/{61266.md => 6605.md} (52%)

diff --git a/backport-changelog/6.6/61266.md b/backport-changelog/6.6/6605.md
similarity index 52%
rename from backport-changelog/6.6/61266.md
rename to backport-changelog/6.6/6605.md
index 4ffdbaccc1332..c45a37d77e660 100644
--- a/backport-changelog/6.6/61266.md
+++ b/backport-changelog/6.6/6605.md
@@ -1,3 +1,3 @@
 https://github.com/WordPress/wordpress-develop/pull/6605
 
-* https://github.com/WordPress/gutenberg/pull/61851
\ No newline at end of file
+* https://github.com/WordPress/gutenberg/pull/61851