From 8ffc0b0f8a374d7264f1a3d7e47f1eab90edd785 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 22 Nov 2021 11:10:20 +0100
Subject: [PATCH] Move the theme editor under tools for FSE themes

---
 .../move-theme-editor-menu-item.php           | 19 +++++++++++++++++++
 lib/load.php                                  |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 lib/compat/wordpress-5.9/move-theme-editor-menu-item.php

diff --git a/lib/compat/wordpress-5.9/move-theme-editor-menu-item.php b/lib/compat/wordpress-5.9/move-theme-editor-menu-item.php
new file mode 100644
index 00000000000000..5e5377fdb453a4
--- /dev/null
+++ b/lib/compat/wordpress-5.9/move-theme-editor-menu-item.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Moves the theme editor menu items for FSE themes.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Moves the "theme editor" under "tools" in FSE themes.
+ */
+function gutenberg_move_theme_editor_in_block_themes() {
+	if ( ! gutenberg_is_fse_theme() || is_multisite() ) {
+		return;
+	}
+	remove_submenu_page( 'themes.php', 'theme-editor.php' );
+	add_submenu_page( 'tools.php', __( 'Theme Editor', 'default' ), __( 'Theme Editor', 'default' ), 'edit_themes', 'theme-editor.php' );
+}
+
+add_action( 'admin_menu', 'gutenberg_move_theme_editor_in_block_themes', 102 );
diff --git a/lib/load.php b/lib/load.php
index d2cb603bb3f4ce..996785e34b96b5 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -122,6 +122,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-5.9/default-theme-supports.php';
 require __DIR__ . '/compat/wordpress-5.9/class-gutenberg-rest-global-styles-controller.php';
 require __DIR__ . '/compat/wordpress-5.9/rest-active-global-styles.php';
+require __DIR__ . '/compat/wordpress-5.9/move-theme-editor-menu-item.php';
 
 require __DIR__ . '/blocks.php';
 require __DIR__ . '/block-patterns.php';