Fix issue with wrong author shown in templates

WordPress · May 13, 2024 · 2fa0a91 · 2fa0a91
1 parent 3d372fe
commit 2fa0a91
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/compat/wordpress-6.6/block-template-utils.php b/lib/compat/wordpress-6.6/block-template-utils.php
@@ -228,6 +228,14 @@ function _gutenberg_get_block_templates_files( $template_type, $query = array()
 	return array_values( $template_files );
 }
 
+function _gutenberg_add_template_details_from_registration( $template_type, $template_object_from_file ) {
+	$registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $template_type, $template_object_from_file->slug );
+	if ( $registered_template ) {
+		$template_object_from_file->plugin = $registered_template->plugin;
+	}
+	return $template_object_from_file;
+}
+
 /**
  * Retrieves a list of unified template objects based on a query.
  *
@@ -327,18 +335,21 @@ function gutenberg_get_block_templates( $query = array(), $template_type = 'wp_t
 			continue;
 		}
 
-		$query_result[] = $template;
+		$query_result[] = _gutenberg_add_template_details_from_registration( $template_type, $template );
 	}
 
 	if ( ! isset( $query['wp_id'] ) ) {
+
 		/*
 		 * If the query has found some use templates, those have priority
 		 * over the theme-provided ones, so we skip querying and building them.
 		 */
 		$query['slug__not_in'] = wp_list_pluck( $query_result, 'slug' );
 		$template_files        = _gutenberg_get_block_templates_files( $template_type, $query );
 		foreach ( $template_files as $template_file ) {
-			$query_result[] = _build_block_template_result_from_file( $template_file, $template_type );
+			$template_object_from_file = _build_block_template_result_from_file( $template_file, $template_type );
+
+			$query_result[] = _gutenberg_add_template_details_from_registration( $template_type, $template_object_from_file );
 		}
 
 		/*
@@ -441,6 +452,8 @@ function gutenberg_get_block_template( $id, $template_type = 'wp_template' ) {
 		$block_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $template_type, $slug );
 	}
 
+	$block_template = _gutenberg_add_template_details_from_registration( $template_type, $block_template );
+
 	/**
 	 * Filters the queried block template object after it's been fetched.
 	 *

diff --git a/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php b/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php
@@ -127,6 +127,7 @@ public function get_template_fallback( $request ) {
 	public function get_item( $request ) {
 		if ( isset( $request['source'] ) && 'theme' === $request['source'] ) {
 			$template = get_block_file_template( $request['id'], $this->post_type );
+			$template = _gutenberg_add_template_details_from_registration( $this->post_type, $template );
 		} elseif ( isset( $request['source'] ) && 'plugin' === $request['source'] ) {
 			list( $namespace, $slug ) = explode( '//', $request['id'] );
 			$template                 = WP_Block_Templates_Registry::get_instance()->get_by_slug( $this->post_type, $slug );