From ec0f08cb5a9910a7913a1d3620f0695d6f9b991a Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 6 Dec 2021 12:36:42 +0100
Subject: [PATCH] Move the block page templates hook into compat/5.9 folder
 (#37142)

---
 .../wordpress-5.9/wp-theme-get-post-templates.php}              | 2 +-
 lib/load.php                                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/{full-site-editing/page-templates.php => compat/wordpress-5.9/wp-theme-get-post-templates.php} (94%)

diff --git a/lib/full-site-editing/page-templates.php b/lib/compat/wordpress-5.9/wp-theme-get-post-templates.php
similarity index 94%
rename from lib/full-site-editing/page-templates.php
rename to lib/compat/wordpress-5.9/wp-theme-get-post-templates.php
index 1e2fc63264b1b2..6cfa8f42f8abf9 100644
--- a/lib/full-site-editing/page-templates.php
+++ b/lib/compat/wordpress-5.9/wp-theme-get-post-templates.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Support for page templates.
+ * Support for custom block-based page templates.
  *
  * @package gutenberg
  */
diff --git a/lib/load.php b/lib/load.php
index 4a5bbedff114a6..bb279495ddfc13 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -105,9 +105,9 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-5.9/class-wp-theme-json-gutenberg.php';
 require __DIR__ . '/compat/wordpress-5.9/class-wp-theme-json-resolver-gutenberg.php';
 require __DIR__ . '/full-site-editing/full-site-editing.php';
-require __DIR__ . '/full-site-editing/page-templates.php';
 require __DIR__ . '/full-site-editing/template-loader.php';
 require __DIR__ . '/full-site-editing/edit-site-page.php';
+require __DIR__ . '/compat/wordpress-5.9/wp-theme-get-post-templates.php';
 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';