Skip to content

Moves to the template loader hooks and functions into lib/compat folder#37149

Merged
youknowriad merged 2 commits intotrunkfrom
move/template-loader-code
Dec 7, 2021
Merged

Moves to the template loader hooks and functions into lib/compat folder#37149
youknowriad merged 2 commits intotrunkfrom
move/template-loader-code

Conversation

@youknowriad
Copy link
Copy Markdown
Contributor

See #37141 for the reasoning here.

@youknowriad youknowriad added [Type] Code Quality Issues or PRs that relate to code quality Backport to WP Beta/RC labels Dec 6, 2021
@youknowriad youknowriad requested a review from ockham December 6, 2021 13:09
@youknowriad youknowriad self-assigned this Dec 6, 2021
@youknowriad youknowriad force-pushed the update/sync-fse-code-1 branch from 28797dc to f5eba78 Compare December 6, 2021 13:09
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that function is useless and I can't find it on Core either. So either we remove it or backport it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scruffian Is this something that is needed for universal themes? Should this be backported as render_block_template or something in Core?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to me like this has been obsolete since #28319 🤔

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed 👍 I was confusing this with block_template_part which is used in hybrid themes.

@youknowriad youknowriad force-pushed the move/template-loader-code branch from 27a4e55 to 708b641 Compare December 6, 2021 13:13
continue;
}
add_filter( str_replace( '-', '', $template_type ) . '_template', 'gutenberg_override_query_template', 20, 3 );
add_filter( str_replace( '-', '', $template_type ) . '_template', 'gutenberg_locate_block_template', 20, 3 );
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just aligning function names with Core equivalents

Copy link
Copy Markdown
Contributor

@ockham ockham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're moving template-canvas.php, I believe we also need to update this path:

diff --git a/lib/compat/wordpress-5.9/block-template.php b/lib/compat/wordpress-5.9/block-template.php
index 85b0a91b4e..4a57ece0d8 100644
--- a/lib/compat/wordpress-5.9/block-template.php
+++ b/lib/compat/wordpress-5.9/block-template.php
@@ -102,7 +102,7 @@ function gutenberg_locate_block_template( $template, $type, array $templates ) {
        add_action( 'wp_head', 'gutenberg_render_title_tag', 1 ); // ...and make it unconditional.
 
        // This file will be included instead of the theme's template file.
-       return gutenberg_dir_path() . 'lib/template-canvas.php';
+       return gutenberg_dir_path() . 'lib/compat/wordpress-5.9/template-canvas.php';
 }
 
 /**

Base automatically changed from update/sync-fse-code-1 to trunk December 7, 2021 09:00
@youknowriad youknowriad force-pushed the move/template-loader-code branch from 708b641 to c1ef717 Compare December 7, 2021 09:05
@youknowriad
Copy link
Copy Markdown
Contributor Author

@ockham good catch, I actually did that change but somehow it got lost before the commit.

Copy link
Copy Markdown
Contributor

@ockham ockham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Riad, this LGTM now! 👍

(We might want to wait for confirmation for this question before merging.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[Type] Code Quality Issues or PRs that relate to code quality

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants