Skip to content

Use core version of template and template part post types and REST endpoints for WP 5.9, with back compat for 5.8 #36898

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

Merged
talldan merged 9 commits into from
Dec 2, 2021
Merged

Use core version of template and template part post types and REST endpoints for WP 5.9, with back compat for 5.8 #36898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f6b3861
Use core version of template and template part post types and REST en…
talldan Nov 25, 2021
d818541
Move files and add explanation
talldan Dec 1, 2021
85f2cf7
Only register gutenberg version of templates and template parts when …
talldan Dec 1, 2021
d210a6c
Rename WP_Block_Template to Gutenberg_Block_Template so that 5.8 rece…
talldan Dec 1, 2021
7452819
Load moved files
talldan Dec 1, 2021
b48f643
Update references and sync some code
talldan Dec 1, 2021
fbf6265
Fix filename
talldan Dec 1, 2021
6d15485
Remove templates tests since Gutenberg now defaults to using the WP c…
talldan Dec 1, 2021
293a96a
Linting and test fixes
talldan Dec 1, 2021
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
Prev Previous commit
Next Next commit
Move files and add explanation
  • Loading branch information
@talldan
talldan committed Dec 1, 2021
commit d81854126a4bbb12eedbc8baac336c608b28f790
12 changes: 8 additions & 4 deletions lib/full-site-editing/template-parts.php → lib/compat/wordpress-5.9/template-parts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
/**
* Block template part functions.
*
* This is a temporary compatibility fix for WordPress 5.8.x, which is missing
* some features for template parts that are present in 5.9.
*
* Once 5.9 is the minimum supported WordPress version for the Gutenberg
* plugin, this shim can be removed.
*
* @package gutenberg
*/

/**
* Registers block editor 'wp_template_part' post type.
*/
function gutenberg_register_template_part_post_type() {
if ( ! gutenberg_supports_block_templates() ) {
if ( post_type_exists( 'wp_template_part' ) ) {
return;
}

// If the post type has already been registered (by WordPress core), skip
// registration.
if ( post_type_exists( 'wp_template_part' ) ) {
if ( ! gutenberg_supports_block_templates() ) {
return;
}

Expand Down
12 changes: 8 additions & 4 deletions lib/full-site-editing/templates.php → lib/compat/wordpress-5.9/templates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
/**
* Block template functions.
*
* This is a temporary compatibility fix for WordPress 5.8.x, which is missing
* some features for templates that are present in 5.9.
*
* Once 5.9 is the minimum supported WordPress version for the Gutenberg
* plugin, this shim can be removed.
*
* @package gutenberg
*/

/**
* Registers block editor 'wp_template' post type.
*/
function gutenberg_register_template_post_type() {
if ( ! gutenberg_supports_block_templates() ) {
if ( post_type_exists( 'wp_template' ) ) {
return;
}

// If the post type has already been registered (by WordPress core), skip
// registration.
if ( post_type_exists( 'wp_template' ) ) {
if ( ! gutenberg_supports_block_templates() ) {
return;
}

Expand Down