Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Block Templates: Add the custom templates info for the template posts #43597

Merged
merged 1 commit into from
Aug 25, 2022
Merged

Block Templates: Add the custom templates info for the template posts #43597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions lib/compat/wordpress-6.1/block-template-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ function gutenberg_get_block_templates( $query = array(), $template_type = 'wp_t
continue;
}

if ( $post_type &&
isset( $template->post_types ) &&
! in_array( $post_type, $template->post_types, true )
) {
continue;
}
Aljullu marked this conversation as resolved.
Show resolved Hide resolved

$query_result[] = $template;
}
if ( ! isset( $query['wp_id'] ) ) {
Expand Down Expand Up @@ -264,8 +271,8 @@ function gutenberg_build_block_template_result_from_post( $post ) {
$is_wp_suggestion = get_post_meta( $post->ID, 'is_wp_suggestion', true );

$theme = $terms[0]->name;
$has_theme_file = wp_get_theme()->get_stylesheet() === $theme &&
null !== _get_block_template_file( $post->post_type, $post->post_name );
$template_file = _get_block_template_file( $post->post_type, $post->post_name );
$has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;

$template = new WP_Block_Template();
$template->wp_id = $post->ID;
Expand All @@ -288,6 +295,10 @@ function gutenberg_build_block_template_result_from_post( $post ) {
$template->is_custom = false;
}

if ( 'wp_template' === $post->post_type && $has_theme_file && isset( $template_file['postTypes'] ) ) {
$template->post_types = $template_file['postTypes'];
}
Aljullu marked this conversation as resolved.
Show resolved Hide resolved

if ( 'wp_template_part' === $post->post_type ) {
$type_terms = get_the_terms( $post, 'wp_template_part_area' );
if ( ! is_wp_error( $type_terms ) && false !== $type_terms ) {
Expand Down